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 /infrastructure/ace/www/testcode.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 'infrastructure/ace/www/testcode.js')
| -rw-r--r-- | infrastructure/ace/www/testcode.js | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/infrastructure/ace/www/testcode.js b/infrastructure/ace/www/testcode.js new file mode 100644 index 0000000..f393335 --- /dev/null +++ b/infrastructure/ace/www/testcode.js @@ -0,0 +1,36 @@ +function getTestCode() { + var testCode = [ +'/* appjet:version 0.1 */', +'(function(){', +'/*', +' * jQuery 1.2.1 - New Wave Javascript', +' *', +' * Copyright (c) 2007 John Resig (jquery.com)', +' * Dual licensed under the MIT (MIT-LICENSE.txt)', +' * and GPL (GPL-LICENSE.txt) licenses.', +' *', +' * $Date: 2007-09-16 23:42:06 -0400 (Sun, 16 Sep 2007) $', +' * $Rev: 3353 $', +' */', +'', +'// Map over jQuery in case of overwrite', +'if ( typeof jQuery != "undefined" )', +' var _jQuery = jQuery;', +'', +'var jQuery = window.jQuery = function(selector, context) {', +' // If the context is a namespace object, return a new object', +' return this instanceof jQuery ?', +' this.init(selector, context) :', +' new jQuery(selector, context);', +'};', +'', +'// Map over the $ in case of overwrite', +'if ( typeof $ != "undefined" )', +' var _$ = $;', +' ', +'// Map the jQuery namespace to the \'$\' one', +'window.$ = jQuery;', +'', +'var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;'].join('\n'); + return testCode; +} |