ace-rails-ap 4.1.3 → 4.4

data/vendor/assets/javascripts/ace/ext-spellcheck.js

@@ -28,7 +28,6 @@ exports.contextMenuHandler = function(e){
     });
 
     host.textInput.setInputHandler(function(newVal) {
-        console.log(newVal , value, text.selectionStart, text.selectionEnd)
         if (newVal == value)
             return '';
         if (newVal.lastIndexOf(value, 0) === 0)
@@ -64,8 +63,11 @@ require("../config").defineOptions(Editor.prototype, "editor", {
     }
 });
 
-});
-                (function() {
-                    window.require(["ace/ext/spellcheck"], function() {});
+});                (function() {
+                    window.require(["ace/ext/spellcheck"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-split.js

@@ -120,11 +120,7 @@ var Split = function(container, theme, splits) {
         var s = new EditSession(session.getDocument(), session.getMode());
 
         var undoManager = session.getUndoManager();
-        if (undoManager) {
-            var undoManagerProxy = new UndoManagerProxy(undoManager, s);
-            s.setUndoManager(undoManagerProxy);
-        }
-        s.$informUndoManager = lang.delayedCall(function() { s.$deltas = []; });
+        s.setUndoManager(undoManager);
         s.setTabSize(session.getTabSize());
         s.setUseSoftTabs(session.getUseSoftTabs());
         s.setOverwrite(session.getOverwrite());
@@ -194,44 +190,6 @@ var Split = function(container, theme, splits) {
 
 }).call(Split.prototype);
 
- 
-function UndoManagerProxy(undoManager, session) {
-    this.$u = undoManager;
-    this.$doc = session;
-}
-
-(function() {
-    this.execute = function(options) {
-        this.$u.execute(options);
-    };
-
-    this.undo = function() {
-        var selectionRange = this.$u.undo(true);
-        if (selectionRange) {
-            this.$doc.selection.setSelectionRange(selectionRange);
-        }
-    };
-
-    this.redo = function() {
-        var selectionRange = this.$u.redo(true);
-        if (selectionRange) {
-            this.$doc.selection.setSelectionRange(selectionRange);
-        }
-    };
-
-    this.reset = function() {
-        this.$u.reset();
-    };
-
-    this.hasUndo = function() {
-        return this.$u.hasUndo();
-    };
-
-    this.hasRedo = function() {
-        return this.$u.hasRedo();
-    };
-}).call(UndoManagerProxy.prototype);
-
 exports.Split = Split;
 });
 
@@ -239,8 +197,11 @@ define("ace/ext/split",["require","exports","module","ace/split"], function(requ
 "use strict";
 module.exports = require("../split");
 
-});
-                (function() {
-                    window.require(["ace/ext/split"], function() {});
+});                (function() {
+                    window.require(["ace/ext/split"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-static_highlight.js

@@ -1,4 +1,4 @@
-define("ace/ext/static_highlight",["require","exports","module","ace/edit_session","ace/layer/text","ace/config","ace/lib/dom"], function(require, exports, module) {
+define("ace/ext/static_highlight",["require","exports","module","ace/edit_session","ace/layer/text","ace/config","ace/lib/dom","ace/lib/lang"], function(require, exports, module) {
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;
@@ -13,6 +13,7 @@ width: 2em;\
 text-align: right;\
 padding: 0 3px 0 0;\
 margin-right: 3px;\
+contain: none;\
 }\
 .ace_static_highlight.ace_show_gutter .ace_line {\
 padding-left: 2.6em;\
@@ -38,9 +39,61 @@ counter-reset: ace_line;\
 ";
 var config = require("../config");
 var dom = require("../lib/dom");
+var escapeHTML = require("../lib/lang").escapeHTML;
+
+function Element(type) {
+    this.type = type;
+    this.style = {};
+    this.textContent = "";
+}
+Element.prototype.cloneNode = function() {
+    return this;
+};
+Element.prototype.appendChild = function(child) {
+    this.textContent += child.toString();
+};
+Element.prototype.toString = function() {
+    var stringBuilder = [];
+    if (this.type != "fragment") {
+        stringBuilder.push("<", this.type);
+        if (this.className)
+            stringBuilder.push(" class='", this.className, "'");
+        var styleStr = [];
+        for (var key in this.style) {
+            styleStr.push(key, ":", this.style[key]);
+        }
+        if (styleStr.length)
+            stringBuilder.push(" style='", styleStr.join(""), "'");
+        stringBuilder.push(">");
+    }
+
+    if (this.textContent) {
+        stringBuilder.push(this.textContent);
+    }
+
+    if (this.type != "fragment") {
+        stringBuilder.push("</", this.type, ">");
+    }
+    
+    return stringBuilder.join("");
+};
+
+
+var simpleDom = {
+    createTextNode: function(textContent, element) {
+        return escapeHTML(textContent);
+    },
+    createElement: function(type) {
+        return new Element(type);
+    },
+    createFragment: function() {
+        return new Element("fragment");
+    }
+};
 
 var SimpleTextLayer = function() {
     this.config = {};
+    this.dom = simpleDom;
 };
 SimpleTextLayer.prototype = TextLayer.prototype;
 
@@ -66,7 +119,7 @@ var highlight = function(el, opts, callback) {
             }
         }
     } else {
-        data = dom.getInnerText(el);
+        data = el.textContent;
         if (opts.trim)
             data = data.trim();
     }
@@ -123,39 +176,54 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
 
     var textLayer = new SimpleTextLayer();
     textLayer.setSession(session);
+    Object.keys(textLayer.$tabStrings).forEach(function(k) {
+        if (typeof textLayer.$tabStrings[k] == "string") {
+            var el = simpleDom.createFragment();
+            el.textContent = textLayer.$tabStrings[k];
+            textLayer.$tabStrings[k] = el;
+        }
+    });
 
     session.setValue(input);
-
-    var stringBuilder = [];
     var length =  session.getLength();
+    
+    var outerEl = simpleDom.createElement("div");
+    outerEl.className = theme.cssClass;
+    
+    var innerEl = simpleDom.createElement("div");
+    innerEl.className = "ace_static_highlight" + (disableGutter ? "" : " ace_show_gutter");
+    innerEl.style["counter-reset"] = "ace_line " + (lineStart - 1);
 
-    for(var ix = 0; ix < length; ix++) {
-        stringBuilder.push("<div class='ace_line'>");
-        if (!disableGutter)
-            stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + /*(ix + lineStart) + */ "</span>");
-        textLayer.$renderLine(stringBuilder, ix, true, false);
-        stringBuilder.push("\n</div>");
+    for (var ix = 0; ix < length; ix++) {
+        var lineEl = simpleDom.createElement("div");
+        lineEl.className = "ace_line";
+        
+        if (!disableGutter) {
+            var gutterEl = simpleDom.createElement("span");
+            gutterEl.className ="ace_gutter ace_gutter-cell";
+            gutterEl.textContent = "";
+            lineEl.appendChild(gutterEl);
+        }
+        textLayer.$renderLine(lineEl, ix, false);
+        lineEl.textContent += "\n";
+        innerEl.appendChild(lineEl);
     }
-    var html = "<div class='" + theme.cssClass + "'>" +
-        "<div class='ace_static_highlight" + (disableGutter ? "" : " ace_show_gutter") +
-            "' style='counter-reset:ace_line " + (lineStart - 1) + "'>" +
-            stringBuilder.join("") +
-        "</div>" +
-    "</div>";
-
-    textLayer.destroy();
+    outerEl.appendChild(innerEl);
 
     return {
         css: baseStyles + theme.cssText,
-        html: html,
+        html: outerEl.toString(),
         session: session
     };
 };
 
 module.exports = highlight;
 module.exports.highlight = highlight;
-});
-                (function() {
-                    window.require(["ace/ext/static_highlight"], function() {});
+});                (function() {
+                    window.require(["ace/ext/static_highlight"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-statusbar.js

@@ -1,7 +1,7 @@
 define("ace/ext/statusbar",["require","exports","module","ace/lib/dom","ace/lib/lang"], function(require, exports, module) {
 "use strict";
-var dom = require("ace/lib/dom");
-var lang = require("ace/lib/lang");
+var dom = require("../lib/dom");
+var lang = require("../lib/lang");
 
 var StatusBar = function(editor, parentNode) {
     this.element = dom.createElement("div");
@@ -10,7 +10,7 @@ var StatusBar = function(editor, parentNode) {
     parentNode.appendChild(this.element);
 
     var statusUpdate = lang.delayedCall(function(){
-        this.updateStatus(editor)
+        this.updateStatus(editor);
     }.bind(this)).schedule.bind(null, 100);
     
     editor.on("changeStatus", statusUpdate);
@@ -46,8 +46,11 @@ var StatusBar = function(editor, parentNode) {
 
 exports.StatusBar = StatusBar;
 
-});
-                (function() {
-                    window.require(["ace/ext/statusbar"], function() {});
+});                (function() {
+                    window.require(["ace/ext/statusbar"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-textarea.js

@@ -123,6 +123,7 @@ border: 1px solid rgb(200, 200, 250);\
 background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
 }\
 ";
+exports.$id = "ace/theme/textmate";
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
@@ -203,6 +204,7 @@ function setupContainer(element, getValue) {
 }
 
 exports.transformTextarea = function(element, options) {
+    var isFocused = element.autofocus || document.activeElement == element;
     var session;
     var container = setupContainer(element, function() {
         return session.getValue();
@@ -225,12 +227,9 @@ exports.transformTextarea = function(element, options) {
         position: "absolute",
         right: "0px",
         bottom: "0px",
-        background: "red",
         cursor: "nw-resize",
-        borderStyle: "solid",
-        borderWidth: "9px 8px 10px 9px",
-        width: "2px",
-        borderColor: "lightblue gray gray lightblue",
+        border: "solid 9px",
+        borderColor: "lightblue gray gray #ceade6",
         zIndex: 101
     });
 
@@ -263,9 +262,10 @@ exports.transformTextarea = function(element, options) {
     session = editor.getSession();
 
     session.setValue(element.value || element.innerHTML);
-    editor.focus();
+    if (isFocused)
+        editor.focus();
     container.appendChild(settingOpener);
-    setupApi(editor, editorDiv, settingDiv, ace, options, load);
+    setupApi(editor, editorDiv, settingDiv, ace, options);
     setupSettingPanel(settingDiv, settingOpener, editor);
 
     var state = "";
@@ -282,6 +282,7 @@ exports.transformTextarea = function(element, options) {
     });
 
     event.addListener(settingOpener, "mousedown", function(e) {
+        e.preventDefault();
         if (state == "toggle") {
             editor.setDisplaySettings();
             return;
@@ -306,10 +307,9 @@ function load(url, module, callback) {
     });
 }
 
-function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
+function setupApi(editor, editorDiv, settingDiv, ace, options) {
     var session = editor.getSession();
     var renderer = editor.renderer;
-    loader = loader || load;
 
     function toBool(value) {
         return value === "true" || value == true;
@@ -335,10 +335,10 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
     editor.setOption = function(key, value) {
         switch (key) {
             case "mode":
-                editor.$setOption("mode", "ace/mode/" + value)
+                editor.$setOption("mode", "ace/mode/" + value);
             break;
             case "theme":
-                editor.$setOption("theme", "ace/theme/" + value)
+                editor.$setOption("theme", "ace/theme/" + value);
             break;
             case "keybindings":
                 switch (value) {
@@ -353,7 +353,7 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
                 }
             break;
 
-            case "softWrap":
+            case "wrap":
             case "fontSize":
                 editor.$setOption(key, value);
             break;
@@ -366,15 +366,15 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
     editor.getOption = function(key) {
         switch (key) {
             case "mode":
-                return editor.$getOption("mode").substr("ace/mode/".length)
+                return editor.$getOption("mode").substr("ace/mode/".length);
             break;
 
             case "theme":
-                return editor.$getOption("theme").substr("ace/theme/".length)
+                return editor.$getOption("theme").substr("ace/theme/".length);
             break;
 
             case "keybindings":
-                var value = editor.getKeyboardHandler()
+                var value = editor.getKeyboardHandler();
                 switch (value && value.$id) {
                     case "ace/keyboard/vim":
                         return "vim";
@@ -553,8 +553,11 @@ exports.defaultOptions = {
     showInvisibles:     "false"
 };
 
-});
-                (function() {
-                    window.require(["ace/ext/textarea"], function() {});
+});                (function() {
+                    window.require(["ace/ext/textarea"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-themelist.js

@@ -1,6 +1,5 @@
-define("ace/ext/themelist",["require","exports","module","ace/lib/fixoldbrowsers"], function(require, exports, module) {
+define("ace/ext/themelist",["require","exports","module"], function(require, exports, module) {
 "use strict";
-require("ace/lib/fixoldbrowsers");
 
 var themeData = [
     ["Chrome"         ],
@@ -14,13 +13,14 @@ var themeData = [
     ["Solarized Light"],
     ["TextMate"       ],
     ["Tomorrow"       ],
-    ["XCode"          ],
+    ["Xcode"          ],
     ["Kuroir"],
     ["KatzenMilch"],
     ["SQL Server"           ,"sqlserver"               , "light"],
     ["Ambiance"             ,"ambiance"                ,  "dark"],
     ["Chaos"                ,"chaos"                   ,  "dark"],
     ["Clouds Midnight"      ,"clouds_midnight"         ,  "dark"],
+    ["Dracula"              ,""                        ,  "dark"],
     ["Cobalt"               ,"cobalt"                  ,  "dark"],
     ["Gruvbox"              ,"gruvbox"                 ,  "dark"],
     ["Green on Black"       ,"gob"                     ,  "dark"],
@@ -30,6 +30,7 @@ var themeData = [
     ["Merbivore Soft"       ,"merbivore_soft"          ,  "dark"],
     ["Mono Industrial"      ,"mono_industrial"         ,  "dark"],
     ["Monokai"              ,"monokai"                 ,  "dark"],
+    ["Nord Dark"            ,"nord_dark"               ,  "dark"],
     ["Pastel on dark"       ,"pastel_on_dark"          ,  "dark"],
     ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
     ["Terminal"             ,"terminal"                ,  "dark"],
@@ -55,8 +56,11 @@ exports.themes = themeData.map(function(data) {
     return theme;
 });
 
-});
-                (function() {
-                    window.require(["ace/ext/themelist"], function() {});
+});                (function() {
+                    window.require(["ace/ext/themelist"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();
             

data/vendor/assets/javascripts/ace/ext-whitespace.js

@@ -38,7 +38,7 @@ exports.$detectIndentation = function(lines, fallback) {
         return score;
     }
 
-    var changesTotal = changes.reduce(function(a,b){return a+b}, 0);
+    var changesTotal = changes.reduce(function(a,b){return a+b;}, 0);
 
     var first = {score: 0, length: 0};
     var spaceIndents = 0;
@@ -176,22 +176,26 @@ exports.$parseArg = function(arg) {
 
 exports.commands = [{
     name: "detectIndentation",
+    description: "Detect indentation from content",
     exec: function(editor) {
         exports.detectIndentation(editor.session);
     }
 }, {
     name: "trimTrailingSpace",
-    exec: function(editor) {
-        exports.trimTrailingSpace(editor.session);
+    description: "Trim trailing whitespace",
+    exec: function(editor, args) {
+        exports.trimTrailingSpace(editor.session, args);
     }
 }, {
     name: "convertIndentation",
+    description: "Convert indentation to ...",
     exec: function(editor, arg) {
         var indent = exports.$parseArg(arg);
         exports.convertIndentation(editor.session, indent.ch, indent.length);
     }
 }, {
     name: "setIndentation",
+    description: "Set indentation",
     exec: function(editor, arg) {
         var indent = exports.$parseArg(arg);
         indent.length && editor.session.setTabSize(indent.length);
@@ -199,8 +203,11 @@ exports.commands = [{
     }
 }];
 
-});
-                (function() {
-                    window.require(["ace/ext/whitespace"], function() {});
+});                (function() {
+                    window.require(["ace/ext/whitespace"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
                 })();