diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/ace/www/ace2_common.js | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/ace/www/ace2_common.js')
-rw-r--r-- | trunk/infrastructure/ace/www/ace2_common.js | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/trunk/infrastructure/ace/www/ace2_common.js b/trunk/infrastructure/ace/www/ace2_common.js deleted file mode 100644 index 4a08de6..0000000 --- a/trunk/infrastructure/ace/www/ace2_common.js +++ /dev/null @@ -1,115 +0,0 @@ -/** - * 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. - */ - - -function isNodeText(node) { - return (node.nodeType == 3); -} - -function object(o) { - var f = function() {}; - f.prototype = o; - return new f(); -} - -function extend(obj, props) { - for(var p in props) { - obj[p] = props[p]; - } - return obj; -} - -function forEach(array, func) { - for(var i=0;i<array.length;i++) { - var result = func(array[i], i); - if (result) break; - } -} - -function map(array, func) { - var result = []; - // must remain compatible with "arguments" pseudo-array - for(var i=0;i<array.length;i++) { - if (func) result.push(func(array[i], i)); - else result.push(array[i]); - } - return result; -} - -function filter(array, func) { - var result = []; - // must remain compatible with "arguments" pseudo-array - for(var i=0;i<array.length;i++) { - if (func(array[i], i)) result.push(array[i]); - } - return result; -} - -function isArray(testObject) { - return testObject && typeof testObject === 'object' && - !(testObject.propertyIsEnumerable('length')) && - typeof testObject.length === 'number'; -} - -// Figure out what browser is being used (stolen from jquery 1.2.1) -var userAgent = navigator.userAgent.toLowerCase(); -var browser = { - version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1], - safari: /webkit/.test(userAgent), - opera: /opera/.test(userAgent), - msie: /msie/.test(userAgent) && !/opera/.test(userAgent), - mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent), - windows: /windows/.test(userAgent) // dgreensp -}; - -function getAssoc(obj, name) { - return obj["_magicdom_"+name]; -} - -function setAssoc(obj, name, value) { - // note that in IE designMode, properties of a node can get - // copied to new nodes that are spawned during editing; also, - // properties representable in HTML text can survive copy-and-paste - obj["_magicdom_"+name] = value; -} - -// "func" is a function over 0..(numItems-1) that is monotonically -// "increasing" with index (false, then true). Finds the boundary -// between false and true, a number between 0 and numItems inclusive. -function binarySearch(numItems, func) { - if (numItems < 1) return 0; - if (func(0)) return 0; - if (! func(numItems-1)) return numItems; - var low = 0; // func(low) is always false - var high = numItems-1; // func(high) is always true - while ((high - low) > 1) { - var x = Math.floor((low+high)/2); // x != low, x != high - if (func(x)) high = x; - else low = x; - } - return high; -} - -function binarySearchInfinite(expectedLength, func) { - var i = 0; - while (!func(i)) i += expectedLength; - return binarySearch(i, func); -} - -function htmlPrettyEscape(str) { - return str.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>') - .replace(/\r?\n/g, '\\n'); -} |