package
This commit is contained in:
Fabian Jakobs
parent
5e41503243
commit
e5fdce9dd3
27 changed files with 686 additions and 93 deletions
|
|
@ -7138,7 +7138,7 @@ var MouseHandler = function(editor) {
|
|||
event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this));
|
||||
event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this));
|
||||
event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseQuadClick.bind(this));
|
||||
event.addMouseWheelListener(mouseTarget, this.onMouseWheel.bind(this));
|
||||
event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this));
|
||||
};
|
||||
|
||||
(function() {
|
||||
|
|
@ -7379,7 +7379,8 @@ var MouseHandler = function(editor) {
|
|||
var speed = this.$scrollSpeed * 2;
|
||||
|
||||
this.editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed);
|
||||
return event.preventDefault(e);
|
||||
if (this.editor.renderer.isScrollableBy(e.wheelX, e.wheelY))
|
||||
return event.preventDefault(e);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -13928,6 +13929,14 @@ var VirtualRenderer = function(container, theme) {
|
|||
deltaX && this.scrollToX(this.scroller.scrollLeft + deltaX);
|
||||
};
|
||||
|
||||
this.isScrollableBy = function(deltaX, deltaY) {
|
||||
if (deltaY < 0 && this.scrollTop > 0)
|
||||
return true;
|
||||
if (deltaY > 0 && this.scrollTop + this.$size.scrollerHeight < this.layerConfig.maxHeight)
|
||||
return true;
|
||||
// todo: handle horizontal scrolling
|
||||
};
|
||||
|
||||
this.screenToTextCoordinates = function(pageX, pageY) {
|
||||
var canvasPos = this.scroller.getBoundingClientRect();
|
||||
|
||||
|
|
@ -15564,7 +15573,7 @@ exports.create = create;
|
|||
|
||||
|
||||
});
|
||||
define("text/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
|
||||
define("text!ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
|
||||
"\n" +
|
||||
"\n" +
|
||||
".ace_editor {\n" +
|
||||
|
|
@ -15735,7 +15744,7 @@ define("text/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/c
|
|||
"}\n" +
|
||||
"");
|
||||
|
||||
define("text/build/demo/styles.css", [], "html {\n" +
|
||||
define("text!build/demo/styles.css", [], "html {\n" +
|
||||
" height: 100%;\n" +
|
||||
" width: 100%;\n" +
|
||||
" overflow: hidden;\n" +
|
||||
|
|
@ -15779,7 +15788,7 @@ define("text/build/demo/styles.css", [], "html {\n" +
|
|||
" text-align: left;\n" +
|
||||
"}");
|
||||
|
||||
define("text/build_support/style.css", [], "body {\n" +
|
||||
define("text!build/textarea/style.css", [], "body {\n" +
|
||||
" margin:0;\n" +
|
||||
" padding:0;\n" +
|
||||
" background-color:#e6f5fc;\n" +
|
||||
|
|
@ -16011,13 +16020,245 @@ define("text/build_support/style.css", [], "body {\n" +
|
|||
"\n" +
|
||||
"");
|
||||
|
||||
define("text/demo/docs/css.css", [], ".text-layer {\n" +
|
||||
define("text!build_support/style.css", [], "body {\n" +
|
||||
" margin:0;\n" +
|
||||
" padding:0;\n" +
|
||||
" background-color:#e6f5fc;\n" +
|
||||
" \n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"H2, H3, H4 {\n" +
|
||||
" font-family:Trebuchet MS;\n" +
|
||||
" font-weight:bold;\n" +
|
||||
" margin:0;\n" +
|
||||
" padding:0;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"H2 {\n" +
|
||||
" font-size:28px;\n" +
|
||||
" color:#263842;\n" +
|
||||
" padding-bottom:6px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"H3 {\n" +
|
||||
" font-family:Trebuchet MS;\n" +
|
||||
" font-weight:bold;\n" +
|
||||
" font-size:22px;\n" +
|
||||
" color:#253741;\n" +
|
||||
" margin-top:43px;\n" +
|
||||
" margin-bottom:8px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"H4 {\n" +
|
||||
" font-family:Trebuchet MS;\n" +
|
||||
" font-weight:bold;\n" +
|
||||
" font-size:21px;\n" +
|
||||
" color:#222222;\n" +
|
||||
" margin-bottom:4px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"P {\n" +
|
||||
" padding:13px 0;\n" +
|
||||
" margin:0;\n" +
|
||||
" line-height:22px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL{\n" +
|
||||
" line-height : 22px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"PRE{\n" +
|
||||
" background : #333;\n" +
|
||||
" color : white;\n" +
|
||||
" padding : 10px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#header {\n" +
|
||||
" height : 227px;\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" background: url(images/background.png) repeat-x 0 0;\n" +
|
||||
" border-bottom:1px solid #c9e8fa; \n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#header .content .signature {\n" +
|
||||
" font-family:Trebuchet MS;\n" +
|
||||
" font-size:11px;\n" +
|
||||
" color:#ebe4d6;\n" +
|
||||
" position:absolute;\n" +
|
||||
" bottom:5px;\n" +
|
||||
" right:42px;\n" +
|
||||
" letter-spacing : 1px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
".content {\n" +
|
||||
" width:970px;\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" margin:0 auto;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#header .content {\n" +
|
||||
" height:184px;\n" +
|
||||
" margin-top:22px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#header .content .logo {\n" +
|
||||
" width : 282px;\n" +
|
||||
" height : 184px;\n" +
|
||||
" background:url(images/logo.png) no-repeat 0 0;\n" +
|
||||
" position:absolute;\n" +
|
||||
" top:0;\n" +
|
||||
" left:0;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#header .content .title {\n" +
|
||||
" width : 605px;\n" +
|
||||
" height : 58px;\n" +
|
||||
" background:url(images/ace.png) no-repeat 0 0;\n" +
|
||||
" position:absolute;\n" +
|
||||
" top:98px;\n" +
|
||||
" left:329px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#wrapper {\n" +
|
||||
" background:url(images/body_background.png) repeat-x 0 0;\n" +
|
||||
" min-height:250px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#wrapper .content {\n" +
|
||||
" font-family:Arial;\n" +
|
||||
" font-size:14px;\n" +
|
||||
" color:#222222;\n" +
|
||||
" width:1000px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#wrapper .content .column1 {\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" float:left;\n" +
|
||||
" width:315px;\n" +
|
||||
" margin-right:31px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#wrapper .content .column2 {\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" float:left;\n" +
|
||||
" width:600px;\n" +
|
||||
" padding-top:47px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
".fork_on_github {\n" +
|
||||
" width:310px;\n" +
|
||||
" height:80px;\n" +
|
||||
" background:url(images/fork_on_github.png) no-repeat 0 0;\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" margin-top:49px;\n" +
|
||||
" cursor:pointer;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
".fork_on_github:hover {\n" +
|
||||
" background-position:0 -80px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
".divider {\n" +
|
||||
" height:3px;\n" +
|
||||
" background-color:#bedaea;\n" +
|
||||
" margin-bottom:3px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
".menu {\n" +
|
||||
" padding:23px 0 0 24px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.content-list {\n" +
|
||||
" padding:15px;\n" +
|
||||
" margin:0;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-list {\n" +
|
||||
" padding:0;\n" +
|
||||
" margin:0 0 20px 0;\n" +
|
||||
" list-style-type:none;\n" +
|
||||
" line-height : 16px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-list LI {\n" +
|
||||
" color:#2557b4;\n" +
|
||||
" font-family:Trebuchet MS;\n" +
|
||||
" font-size:14px;\n" +
|
||||
" padding:7px 0;\n" +
|
||||
" border-bottom:1px dotted #d6e2e7;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-list LI:last-child {\n" +
|
||||
" border-bottom:0;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"A {\n" +
|
||||
" color:#2557b4;\n" +
|
||||
" text-decoration:none;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"A:hover {\n" +
|
||||
" text-decoration:underline;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"P#first{\n" +
|
||||
" background : rgba(255,255,255,0.5);\n" +
|
||||
" padding : 20px;\n" +
|
||||
" font-size : 16px;\n" +
|
||||
" line-height : 24px;\n" +
|
||||
" margin : 0 0 20px 0;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"#footer {\n" +
|
||||
" height:40px;\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
" background:url(images/bottombar.png) repeat-x 0 0;\n" +
|
||||
" position:relative;\n" +
|
||||
" margin-top:40px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-footer {\n" +
|
||||
" padding:0;\n" +
|
||||
" margin:8px 11px 0 0;\n" +
|
||||
" list-style-type:none;\n" +
|
||||
" float:right;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-footer LI {\n" +
|
||||
" color:white;\n" +
|
||||
" font-family:Arial;\n" +
|
||||
" font-size:12px;\n" +
|
||||
" display:inline-block;\n" +
|
||||
" margin:0 1px;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-footer LI A {\n" +
|
||||
" color:#8dd0ff;\n" +
|
||||
" text-decoration:none;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"UL.menu-footer LI A:hover {\n" +
|
||||
" text-decoration:underline;\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
"\n" +
|
||||
"\n" +
|
||||
"\n" +
|
||||
"");
|
||||
|
||||
define("text!demo/docs/css.css", [], ".text-layer {\n" +
|
||||
" font-family: Monaco, \"Courier New\", monospace;\n" +
|
||||
" font-size: 12px;\n" +
|
||||
" cursor: text;\n" +
|
||||
"}");
|
||||
|
||||
define("text/demo/styles.css", [], "html {\n" +
|
||||
define("text!demo/styles.css", [], "html {\n" +
|
||||
" height: 100%;\n" +
|
||||
" width: 100%;\n" +
|
||||
" overflow: hidden;\n" +
|
||||
|
|
@ -16061,7 +16302,7 @@ define("text/demo/styles.css", [], "html {\n" +
|
|||
" text-align: left;\n" +
|
||||
"}");
|
||||
|
||||
define("text/deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
|
||||
define("text!deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
|
||||
"\n" +
|
||||
"@import url(\"booya.css\") print,screen;\n" +
|
||||
"@import \"whatup.css\" screen;\n" +
|
||||
|
|
@ -16105,7 +16346,7 @@ define("text/deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
|
|||
" }\n" +
|
||||
"}");
|
||||
|
||||
define("text/deps/requirejs/dist/ie.css", [], "\n" +
|
||||
define("text!deps/requirejs/dist/ie.css", [], "\n" +
|
||||
"body .sect {\n" +
|
||||
" display: none;\n" +
|
||||
"}\n" +
|
||||
|
|
@ -16116,7 +16357,7 @@ define("text/deps/requirejs/dist/ie.css", [], "\n" +
|
|||
"}\n" +
|
||||
"");
|
||||
|
||||
define("text/deps/requirejs/dist/main.css", [], "@font-face {\n" +
|
||||
define("text!deps/requirejs/dist/main.css", [], "@font-face {\n" +
|
||||
" font-family: Inconsolata;\n" +
|
||||
" src: url(\"fonts/Inconsolata.ttf\");\n" +
|
||||
"}\n" +
|
||||
|
|
@ -16803,7 +17044,7 @@ define("text/deps/requirejs/dist/main.css", [], "@font-face {\n" +
|
|||
" height: 1%;\n" +
|
||||
"}");
|
||||
|
||||
define("text/doc/site/iphone.css", [], "#wrapper {\n" +
|
||||
define("text!doc/site/iphone.css", [], "#wrapper {\n" +
|
||||
" position:relative;\n" +
|
||||
" overflow:hidden;\n" +
|
||||
"}\n" +
|
||||
|
|
@ -16830,7 +17071,7 @@ define("text/doc/site/iphone.css", [], "#wrapper {\n" +
|
|||
"}\n" +
|
||||
"");
|
||||
|
||||
define("text/doc/site/style.css", [], "body {\n" +
|
||||
define("text!doc/site/style.css", [], "body {\n" +
|
||||
" margin:0;\n" +
|
||||
" padding:0;\n" +
|
||||
" background-color:#e6f5fc;\n" +
|
||||
|
|
@ -17062,7 +17303,7 @@ define("text/doc/site/style.css", [], "body {\n" +
|
|||
"\n" +
|
||||
"");
|
||||
|
||||
define("text/lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
|
||||
define("text!lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
|
||||
"\n" +
|
||||
"\n" +
|
||||
".ace_editor {\n" +
|
||||
|
|
@ -17233,7 +17474,7 @@ define("text/lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.c
|
|||
"}\n" +
|
||||
"");
|
||||
|
||||
define("text/node_modules/uglify-js/docstyle.css", [], "html { font-family: \"Lucida Grande\",\"Trebuchet MS\",sans-serif; font-size: 12pt; }\n" +
|
||||
define("text!node_modules/uglify-js/docstyle.css", [], "html { font-family: \"Lucida Grande\",\"Trebuchet MS\",sans-serif; font-size: 12pt; }\n" +
|
||||
"body { max-width: 60em; }\n" +
|
||||
".title { text-align: center; }\n" +
|
||||
".todo { color: red; }\n" +
|
||||
|
|
@ -17310,7 +17551,7 @@ define("text/node_modules/uglify-js/docstyle.css", [], "html { font-family: \"Lu
|
|||
"}\n" +
|
||||
"");
|
||||
|
||||
define("text/support/cockpit/lib/cockpit/ui/cli_view.css", [], "\n" +
|
||||
define("text!support/cockpit/lib/cockpit/ui/cli_view.css", [], "\n" +
|
||||
"#cockpitInput { padding-left: 16px; }\n" +
|
||||
"\n" +
|
||||
".cptOutput { overflow: auto; position: absolute; z-index: 999; display: none; }\n" +
|
||||
|
|
@ -17346,7 +17587,7 @@ define("text/support/cockpit/lib/cockpit/ui/cli_view.css", [], "\n" +
|
|||
".cptGt { font-weight: bold; font-size: 120%; }\n" +
|
||||
"");
|
||||
|
||||
define("text/support/cockpit/lib/cockpit/ui/request_view.css", [], "\n" +
|
||||
define("text!support/cockpit/lib/cockpit/ui/request_view.css", [], "\n" +
|
||||
".cptRowIn {\n" +
|
||||
" display: box; display: -moz-box; display: -webkit-box;\n" +
|
||||
" box-orient: horizontal; -moz-box-orient: horizontal; -webkit-box-orient: horizontal;\n" +
|
||||
|
|
@ -17387,7 +17628,7 @@ define("text/support/cockpit/lib/cockpit/ui/request_view.css", [], "\n" +
|
|||
".cptRowOutput .right { text-align: right; }\n" +
|
||||
"");
|
||||
|
||||
define("text/tool/Theme.tmpl.css", [], ".%cssClass% .ace_editor {\n" +
|
||||
define("text!tool/Theme.tmpl.css", [], ".%cssClass% .ace_editor {\n" +
|
||||
" border: 2px solid rgb(159, 159, 159);\n" +
|
||||
"}\n" +
|
||||
"\n" +
|
||||
|
|
@ -17557,13 +17798,13 @@ define("text/tool/Theme.tmpl.css", [], ".%cssClass% .ace_editor {\n" +
|
|||
" %collab.user1% \n" +
|
||||
"}");
|
||||
|
||||
define("text/docs/css.css", [], ".text-layer {\n" +
|
||||
define("text!docs/css.css", [], ".text-layer {\n" +
|
||||
" font-family: Monaco, \"Courier New\", monospace;\n" +
|
||||
" font-size: 12px;\n" +
|
||||
" cursor: text;\n" +
|
||||
"}");
|
||||
|
||||
define("text/styles.css", [], "html {\n" +
|
||||
define("text!styles.css", [], "html {\n" +
|
||||
" height: 100%;\n" +
|
||||
" width: 100%;\n" +
|
||||
" overflow: hidden;\n" +
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue