From d912ef9675f2e516df4eba081107729afbffe10c Mon Sep 17 00:00:00 2001 From: "alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c" Date: Wed, 3 Feb 2010 00:49:06 +0000 Subject: updated files in repo generated by ACE build (just comments moving around and stuff) --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%407 --- .../src/etherpad/collab/ace/contentcollector.js | 12 ++-- trunk/etherpad/src/etherpad/collab/ace/domline.js | 10 +-- .../etherpad/src/etherpad/collab/ace/easysync1.js | 74 +++++++++++----------- .../etherpad/src/etherpad/collab/ace/easysync2.js | 12 ++-- .../src/etherpad/collab/ace/easysync2_tests.js | 12 ++-- .../src/etherpad/collab/ace/linestylefilter.js | 12 ++-- trunk/etherpad/src/static/js/ace.js | 16 ----- trunk/etherpad/src/static/js/colorutils.js | 10 +-- trunk/etherpad/src/static/js/cssmanager_client.js | 18 +++--- trunk/etherpad/src/static/js/domline_client.js | 10 +-- trunk/etherpad/src/static/js/easysync2_client.js | 10 +-- .../src/static/js/linestylefilter_client.js | 10 +-- 12 files changed, 95 insertions(+), 111 deletions(-) diff --git a/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js b/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js index e316c81..22e552a 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js +++ b/trunk/etherpad/src/etherpad/collab/ace/contentcollector.js @@ -1,12 +1,15 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/contentcollector.js +import("etherpad.collab.ace.easysync2.Changeset") + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,9 +17,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/contentcollector.js -import("etherpad.collab.ace.easysync2.Changeset") - var _MAX_LIST_LEVEL = 8; function sanitizeUnicode(s) { diff --git a/trunk/etherpad/src/etherpad/collab/ace/domline.js b/trunk/etherpad/src/etherpad/collab/ace/domline.js index c0f612f..de2e7d3 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/domline.js +++ b/trunk/etherpad/src/etherpad/collab/ace/domline.js @@ -1,12 +1,14 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,8 +16,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js - var domline = {}; domline.noop = function() {}; domline.identity = function(x) { return x; }; diff --git a/trunk/etherpad/src/etherpad/collab/ace/easysync1.js b/trunk/etherpad/src/etherpad/collab/ace/easysync1.js index c141707..4f40aa0 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/easysync1.js +++ b/trunk/etherpad/src/etherpad/collab/ace/easysync1.js @@ -1,12 +1,14 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easy_sync.js + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,8 +16,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easy_sync.js - function Changeset(arg) { var array; @@ -38,7 +38,7 @@ function Changeset(arg) { else array = arg; array.isChangeset = true; - + // OOP style: attach generic methods to array object, hold no state in environment //function error(msg) { top.console.error(msg); top.console.trace(); } @@ -51,7 +51,7 @@ function Changeset(arg) { return this.length == 6 && this[1] == this[2] && this[3] == 0 && this[4] == this[1] && this[5] == ""; } - + array.eachStrip = function(func, thisObj) { // inside "func", the method receiver will be "this" by default, // or you can pass an object. @@ -66,7 +66,7 @@ function Changeset(arg) { array.numStrips = function() { return (this.length-3)/3; }; array.oldLen = function() { return this[1]; }; array.newLen = function() { return this[2]; }; - + array.checkRep = function() { assert(this[0] == Changeset.MAGIC, "bad magic"); assert(this[1] >= 0, "bad old text length"); @@ -97,7 +97,7 @@ function Changeset(arg) { }); assert(newLen == actualNewLen, "calculated new text length doesn't match"); } - + array.applyToText = function(text) { assert(text.length == this.oldLen(), "mismatched apply: "+text.length+" / "+this.oldLen()); var buf = []; @@ -139,7 +139,7 @@ function Changeset(arg) { C.authors = [_getNumInserted(C), author || '']; return C; } - + array.builder = function() { // normal pattern is Changeset(oldLength).builder().appendOldText(...). ... // builder methods mutate this! @@ -166,7 +166,7 @@ function Changeset(arg) { C.authors.push(str.length, a); } } - + return self; }, appendOldText: function(startIndex, numTaken) { @@ -193,7 +193,7 @@ function Changeset(arg) { array.authorSlicer = function(outputBuilder) { return _makeAuthorSlicer(this, outputBuilder); } - + function _makeAuthorSlicer(changesetOrAuthorsIn, builderOut) { // "builderOut" only needs to support appendNewText var authors; // considered immutable @@ -203,13 +203,13 @@ function Changeset(arg) { else { authors = changesetOrAuthorsIn; } - + // OOP style: state in environment var authorPtr = 0; var charIndex = 0; var charWithinAuthor = 0; // 0 <= charWithinAuthor <= authors[authorPtr]; max value iff atEnd var atEnd = false; - function curAuthor() { return authors[authorPtr+1]; } + function curAuthor() { return authors[authorPtr+1]; } function curAuthorWidth() { return authors[authorPtr]; } function assertNotAtEnd() { assert(! atEnd, "_authorSlicer: can't move past end"); } function forwardInAuthor(numChars) { @@ -225,7 +225,7 @@ function Changeset(arg) { atEnd = true; } } - + var self; return self = { skipChars: function(n) { @@ -278,11 +278,11 @@ function Changeset(arg) { } }; } - + function _makeSlicer(C, output) { // C: Changeset, output: builder from _makeBuilder // C is considered immutable, won't change or be changed - + // OOP style: state in environment var charIndex = 0; // 0 <= charIndex <= C.newLen(); maximum value iff atEnd var stripIndex = 0; // 0 <= stripIndex <= C.numStrips(); maximum value iff atEnd @@ -293,7 +293,7 @@ function Changeset(arg) { if (C.authors) { authorSlicer = _makeAuthorSlicer(C.authors, output); } - + var ptr = 3; function curStartIndex() { return C[ptr]; } function curNumTaken() { return C[ptr+1]; } @@ -327,7 +327,7 @@ function Changeset(arg) { if (e < s) return 0; return e-s; } - + var self; return self = { skipChars: function (n) { @@ -344,7 +344,7 @@ function Changeset(arg) { if (authorSlicer) authorSlicer.skipChars(curNumNewCharsInRange(charWithinStrip, charWithinStrip + leftInStrip)); - + leftToSkip -= leftInStrip; nextStrip(); } @@ -352,7 +352,7 @@ function Changeset(arg) { if (authorSlicer) authorSlicer.skipChars(curNumNewCharsInRange(charWithinStrip, charWithinStrip + leftToSkip)); - + forwardInStrip(leftToSkip); leftToSkip = 0; } @@ -379,9 +379,9 @@ function Changeset(arg) { charWithinStrip < curStripWidth()) { // at least one char to take from current strip's newText var leftInNewText = (curStripWidth() - charWithinStrip); - assert(leftInNewText > 0, "_slicer: should have leftInNewText > 0"); + assert(leftInNewText > 0, "_slicer: should have leftInNewText > 0"); var toTake = min(leftInNewText, leftToTake); - assert(toTake > 0, "_slicer: should have toTake > 0"); + assert(toTake > 0, "_slicer: should have toTake > 0"); var newText = curNewText().substr(charWithinStrip - curNumTaken(), toTake); if (authorSlicer) { authorSlicer.takeChars(newText.length, newText); @@ -407,7 +407,7 @@ function Changeset(arg) { array.slicer = function(outputBuilder) { return _makeSlicer(this, outputBuilder); } - + array.compose = function(next) { assert(next.oldLen() == this.newLen(), "mismatched composition"); @@ -418,7 +418,7 @@ function Changeset(arg) { if (next.authors) { authorSlicer = _makeAuthorSlicer(next.authors, builder); } - + next.eachStrip(function(s, t, n) { slicer.skipTo(s); slicer.takeChars(t); @@ -436,7 +436,7 @@ function Changeset(arg) { array.traverser = function() { return _makeTraverser(this); } - + function _makeTraverser(C) { var s = C[3], t = C[4], n = C[5]; var nextIndex = 6; @@ -446,7 +446,7 @@ function Changeset(arg) { if (C.authors) { authorSlicer = _makeAuthorSlicer(C.authors, null); } - + function advanceIfPossible() { if (t == 0 && n == "" && nextIndex < C.length) { s = C[nextIndex]; @@ -561,7 +561,7 @@ function Changeset(arg) { } return builder.toChangeset(); } - + array.encodeToString = function(asBinary) { var stringDataArray = []; var numsArray = []; @@ -585,7 +585,7 @@ function Changeset(arg) { return "\\u"+("0000"+c.charCodeAt(0).toString(16)).slice(-4); }); } - + array.applyToAttributedText = Changeset.applyToAttributedText; function splicesFromChanges(c) { @@ -616,11 +616,11 @@ function Changeset(arg) { } return splices; } - + array.toSplices = function() { return splicesFromChanges(this); } - + array.characterRangeFollowThis = function(selStartChar, selEndChar, insertionsAfter) { var changeset = this; // represent the selection as a changeset that replaces the selection with some finite string. @@ -650,7 +650,7 @@ function Changeset(arg) { } return [selStartChar, selEndChar]; } - + return array; } @@ -660,7 +660,7 @@ Changeset.makeSplice = function(oldLength, spliceStart, numRemoved, stringInsert spliceStart = (spliceStart || 0); numRemoved = (numRemoved || 0); stringInserted = String(stringInserted || ""); - + var builder = Changeset(oldLength).builder(); builder.appendOldText(0, spliceStart); builder.appendNewText(stringInserted); @@ -688,7 +688,7 @@ Changeset.decodeFromString = function(str) { return String.fromCharCode(Number("0x"+seq.substring(2))); }); } - + var numData, stringData; var binary = false; var typ = str.charAt(0); @@ -765,7 +765,7 @@ Changeset.numberArrayFromString = function(str, startIndex) { } else { // legacy format - n = (((n & 0x1fff) << 16) | str.charCodeAt(strIndex++)); + n = (((n & 0x1fff) << 16) | str.charCodeAt(strIndex++)); } } return n; @@ -805,7 +805,7 @@ Changeset.numberArrayFromString = function(str, startIndex) { } return 0; } - + // emptyObj may be a StorableObject Changeset.initAttributedText = function(emptyObj, initialString, initialAuthor) { var obj = emptyObj; @@ -894,7 +894,7 @@ Changeset.numberArrayFromString = function(str, startIndex) { // call func(author, authorNum) for(var a in atObj.authorMap) { if (func(atObj.authorMap[a], Number(a))) break; - } + } }; Changeset.getAttributedTextAuthorByNum = function(atObj, n) { return atObj.authorMap[n]; diff --git a/trunk/etherpad/src/etherpad/collab/ace/easysync2.js b/trunk/etherpad/src/etherpad/collab/ace/easysync2.js index a75d850..0fa1ec4 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/easysync2.js +++ b/trunk/etherpad/src/etherpad/collab/ace/easysync2.js @@ -1,12 +1,15 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js +jimport("com.etherpad.Easysync2Support"); + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,9 +17,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js -jimport("com.etherpad.Easysync2Support"); - //var _opt = (this.Easysync2Support || null); var _opt = null; // disable optimization for now diff --git a/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js b/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js index 71ca505..7a23dc0 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js +++ b/trunk/etherpad/src/etherpad/collab/ace/easysync2_tests.js @@ -1,12 +1,15 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2_tests.js +import("etherpad.collab.ace.easysync2.*") + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,9 +17,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2_tests.js -import("etherpad.collab.ace.easysync2.*") - function runTests() { function print(str) { diff --git a/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js b/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js index 66f8f72..ffc8034 100644 --- a/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js +++ b/trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js @@ -1,12 +1,15 @@ +// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js +import("etherpad.collab.ace.easysync2.Changeset"); + /** * Copyright 2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,9 +17,6 @@ * limitations under the License. */ -// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js -import("etherpad.collab.ace.easysync2.Changeset"); - // requires: easysync2.Changeset var linestylefilter = {}; diff --git a/trunk/etherpad/src/static/js/ace.js b/trunk/etherpad/src/static/js/ace.js index d623dd4..7f19d37 100644 --- a/trunk/etherpad/src/static/js/ace.js +++ b/trunk/etherpad/src/static/js/ace.js @@ -1,19 +1,3 @@ -/** - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - Ace2Editor.registry={nextId:1};function Ace2Editor(){var K="Ace2Editor";var F=Ace2Editor;var B={};var A={editor:B,id:(F.registry.nextId++)}; var D=false;var E=[];function C(R,Q){return function(){var T=this;var S=arguments;function U(){R.apply(T,S); }if(Q){Q.apply(T,S);}if(D){U();}else{E.push(U);}};}function I(){for(var Q=0;Q