sync with c9

ajaxorg · Aug 14, 2018 · 8049e16 · 8049e16
1 parent 3ac2764
commit 8049e16
Show file tree

Hide file tree

Showing 11 changed files with 853 additions and 850 deletions.
diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js
@@ -84,7 +84,7 @@ var BackgroundTokenizer = function(tokenizer, editor) {
 
             // only check every 5 lines
             processedLines ++;
-            if ((processedLines % 5 === 0) && (new Date() - workerStart) > 20) {                
+            if ((processedLines % 5 === 0) && (new Date() - workerStart) > 20) {
                 self.running = setTimeout(self.$worker, 20);
                 break;
             }

diff --git a/lib/ace/ext/themelist.js b/lib/ace/ext/themelist.js
@@ -41,7 +41,6 @@
 
 define(function(require, exports, module) {
 "use strict";
-require("ace/lib/fixoldbrowsers");
 
 var themeData = [
     ["Chrome"         ],

diff --git a/lib/ace/lib/event_emitter.js b/lib/ace/lib/event_emitter.js
@@ -78,10 +78,16 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    callback && this.addEventListener(eventName, function newCallback() {
+    this.addEventListener(eventName, function newCallback() {
         _self.removeEventListener(eventName, newCallback);
         callback.apply(null, arguments);
     });
+    if (!callback) {
+        /*global Promise*/
+        return new Promise(function(resolve) {
+            callback = resolve;
+        });
+    }
 };
 
 

diff --git a/lib/ace/lib/keys.js b/lib/ace/lib/keys.js
@@ -34,8 +34,6 @@ For more information about SproutCore, visit http://www.sproutcore.com
 define(function(require, exports, module) {
 "use strict";
 
-require("./fixoldbrowsers");
-
 var oop = require("./oop");
 
 /*

diff --git a/lib/ace/mode/diff.js b/lib/ace/mode/diff.js
@@ -38,7 +38,7 @@ var FoldMode = require("./folding/diff").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = HighlightRules;
-    this.foldingRules = new FoldMode(["diff", "index", "\\+{3}", "@@|\\*{5}"], "i");
+    this.foldingRules = new FoldMode(["diff", "@@|\\*{5}"], "i");
 };
 oop.inherits(Mode, TextMode);
 

diff --git a/lib/ace/mode/folding/diff.js b/lib/ace/mode/folding/diff.js
@@ -61,7 +61,7 @@ oop.inherits(FoldMode, BaseFoldMode);
         }
         if (row == start.row + 1)
             return;
-        return  Range.fromPoints(start, {row: row - 1, column: line.length});
+        return new Range(start.row, start.column, row - 1, line.length);
     };
 
 }).call(FoldMode.prototype);

diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js
diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js
@@ -34,7 +34,7 @@ define(function(require, exports, module) {
 var useragent = require("../lib/useragent");
 
 var DRAG_OFFSET = 0; // pixels
-var SCROLL_COOLDOWN_T = 250; // milliseconds
+var SCROLL_COOLDOWN_T = 550; // milliseconds
 
 function DefaultHandlers(mouseHandler) {
     mouseHandler.$clickSelection = null;
@@ -270,8 +270,8 @@ function DefaultHandlers(mouseHandler) {
         if (canScroll) {
             prevScroll.allowed = t;
         } else if (t - prevScroll.allowed < SCROLL_COOLDOWN_T) {
-            var isSlower = Math.abs(vx) <= 1.1 * Math.abs(prevScroll.vx)
-                && Math.abs(vy) <= 1.1 * Math.abs(prevScroll.vy);
+            var isSlower = Math.abs(vx) <= 1.5 * Math.abs(prevScroll.vx)
+                && Math.abs(vy) <= 1.5 * Math.abs(prevScroll.vy);
             if (isSlower) {
                 canScroll = true;
                 prevScroll.allowed = t;

diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js
@@ -63,7 +63,7 @@ var ScrollBar = function(parent) {
 
     this.setVisible(false);
     this.skipEvent = false;
-    
+
     event.addListener(this.element, "scroll", this.onScroll.bind(this));
     event.addListener(this.element, "mousedown", event.preventDefault);
 };

diff --git a/lib/ace/snippets.js b/lib/ace/snippets.js
@@ -308,7 +308,7 @@ var SnippetManager = function() {
                 return;
 
             var value = tokens.slice(i + 1, i1);
-            var isNested = value.some(function(t) {return typeof t === "object";});          
+            var isNested = value.some(function(t) {return typeof t === "object";});
             if (isNested && !ts.value) {
                 ts.value = value;
             } else if (value.length && (!ts.value || typeof ts.value !== "string")) {

diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
@@ -1235,7 +1235,7 @@ var VirtualRenderer = function(container, theme) {
         } else if (scrollTop + this.$size.scrollerHeight - bottomMargin < top + this.lineHeight) {
             if (offset && scrollTop + this.$size.scrollerHeight - bottomMargin < top -  this.lineHeight)
                 top += offset * this.$size.scrollerHeight;
-            this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);
+            this.session.setScrollTop(top + this.lineHeight + bottomMargin - this.$size.scrollerHeight);
         }
 
         var scrollLeft = this.scrollLeft;