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/build/index.html | |
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/build/index.html')
-rw-r--r-- | trunk/infrastructure/ace/build/index.html | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/trunk/infrastructure/ace/build/index.html b/trunk/infrastructure/ace/build/index.html deleted file mode 100644 index b8c8505..0000000 --- a/trunk/infrastructure/ace/build/index.html +++ /dev/null @@ -1,47 +0,0 @@ -<!DOCTYPE html PUBLIC - "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> - <head> - <title>A Code Editor</title> - <script src="jquery-1.2.1.js"></script> - - <script src="testcode.js"></script> - <script src="ace2.js"></script> - <script> - $(document).ready(function() { - var editor = new Ace2Editor(); - editor.init("editorcontainer", getTestCode(), editorReady); - - editor.setOnKeyPress(function (evt) { - if (evt.ctrlKey && evt.which == "s".charCodeAt(0)) { - alert("You tried to save."); - return false; - } - return true; - }); - - function editorReady() { - resizeEditor(); - $(window).bind("resize", resizeEditor); - setTimeout(function() {editor.focus();}, 0); - } - - function resizeEditor() { - $("#editorcontainer").get(0).style.height = "100%"; - editor.getFrame().style.height = ((document.documentElement.clientHeight)-1)+"px"; - editor.adjustSize(); - } - }); - </script> - <style> - html { overflow: hidden } /* for Win IE 6 */ - body { margin:0; padding:0; border:0; overflow: hidden; } - #editorcontainer { height: 1000px; /* changed programmatically */ } - #editorcontainer iframe { width: 100%; height: 100%; border:0; padding:0; margin:0; } - </style> - </head> - <body> - <div id="editorcontainer"><!-- --></div> - </body> -</html> |