summaryrefslogtreecommitdiffstats
path: root/trunk/etherpad/src/static
diff options
context:
space:
mode:
authorDavid Greenspan <davidgreenspan@gmail.com>2009-12-25 22:53:09 -0500
committerDavid Greenspan <davidgreenspan@gmail.com>2009-12-25 22:53:09 -0500
commit0b2d5baa407153d20c7eb08fb4ff9960c1cf13c9 (patch)
tree7d274255e87c8af86e0bcba2a446c3acc7b56d75 /trunk/etherpad/src/static
parentf62c1e3c7f283dbfb0c9f7c9a5c015c91968066f (diff)
downloadetherpad-0b2d5baa407153d20c7eb08fb4ff9960c1cf13c9.tar.gz
etherpad-0b2d5baa407153d20c7eb08fb4ff9960c1cf13c9.tar.bz2
etherpad-0b2d5baa407153d20c7eb08fb4ff9960c1cf13c9.zip
updated files in repo generated by ACE build (just comments moving around and stuff)
Diffstat (limited to 'trunk/etherpad/src/static')
-rw-r--r--trunk/etherpad/src/static/js/ace.js16
-rw-r--r--trunk/etherpad/src/static/js/colorutils.js10
-rw-r--r--trunk/etherpad/src/static/js/cssmanager_client.js18
-rw-r--r--trunk/etherpad/src/static/js/domline_client.js10
-rw-r--r--trunk/etherpad/src/static/js/easysync2_client.js10
-rw-r--r--trunk/etherpad/src/static/js/linestylefilter_client.js10
6 files changed, 29 insertions, 45 deletions
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<E.length;Q++){E[Q]();}E=[];
diff --git a/trunk/etherpad/src/static/js/colorutils.js b/trunk/etherpad/src/static/js/colorutils.js
index 55c3a5d..e745f8e 100644
--- a/trunk/etherpad/src/static/js/colorutils.js
+++ b/trunk/etherpad/src/static/js/colorutils.js
@@ -1,12 +1,14 @@
+// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/colorutils.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/colorutils.js
-
var colorutils = {};
// "#ffffff" or "#fff" or "ffffff" or "fff" to [1.0, 1.0, 1.0]
diff --git a/trunk/etherpad/src/static/js/cssmanager_client.js b/trunk/etherpad/src/static/js/cssmanager_client.js
index 7617212..04ed641 100644
--- a/trunk/etherpad/src/static/js/cssmanager_client.js
+++ b/trunk/etherpad/src/static/js/cssmanager_client.js
@@ -1,12 +1,14 @@
+// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/cssmanager.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/cssmanager.js
-
function makeCSSManager(emptyStylesheetTitle) {
function getSheetByTitle(title) {
@@ -37,9 +37,9 @@ function makeCSSManager(emptyStylesheetTitle) {
return t;
}
}
- return null;
+ return null;
}*/
-
+
var browserSheet = getSheetByTitle(emptyStylesheetTitle);
//var browserTag = getSheetTagByTitle(emptyStylesheetTitle);
function browserRules() { return (browserSheet.cssRules || browserSheet.rules); }
@@ -59,7 +59,7 @@ function makeCSSManager(emptyStylesheetTitle) {
return i;
}
}
- return -1;
+ return -1;
}
function selectorStyle(selector) {
@@ -80,7 +80,7 @@ function makeCSSManager(emptyStylesheetTitle) {
selectorList.splice(i, 1);
}
}
-
+
return {selectorStyle:selectorStyle, removeSelectorStyle:removeSelectorStyle,
info: function() {
return selectorList.length+":"+browserRules().length;
diff --git a/trunk/etherpad/src/static/js/domline_client.js b/trunk/etherpad/src/static/js/domline_client.js
index c0f612f..de2e7d3 100644
--- a/trunk/etherpad/src/static/js/domline_client.js
+++ b/trunk/etherpad/src/static/js/domline_client.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/static/js/easysync2_client.js b/trunk/etherpad/src/static/js/easysync2_client.js
index 7b73ebf..043099c 100644
--- a/trunk/etherpad/src/static/js/easysync2_client.js
+++ b/trunk/etherpad/src/static/js/easysync2_client.js
@@ -1,12 +1,14 @@
+// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.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/easysync2.js
-
//var _opt = (this.Easysync2Support || null);
var _opt = null; // disable optimization for now
diff --git a/trunk/etherpad/src/static/js/linestylefilter_client.js b/trunk/etherpad/src/static/js/linestylefilter_client.js
index 52feb87..df35c3c 100644
--- a/trunk/etherpad/src/static/js/linestylefilter_client.js
+++ b/trunk/etherpad/src/static/js/linestylefilter_client.js
@@ -1,12 +1,14 @@
+// DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.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/linestylefilter.js
-
// requires: easysync2.Changeset
var linestylefilter = {};