gollum 3.1.2 → 3.1.3

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/range_list.js

@@ -30,30 +30,28 @@
 
 define(function(require, exports, module) {
 "use strict";
-
+var Range = require("./range").Range;
+var comparePoints = Range.comparePoints;
 
 var RangeList = function() {
     this.ranges = [];
 };
 
 (function() {
-    this.comparePoints = function(p1, p2) {
-        return p1.row - p2.row || p1.column - p2.column;
-    };
+    this.comparePoints = comparePoints;
 
-    this.pointIndex = function(pos, startIndex) {
+    this.pointIndex = function(pos, excludeEdges, startIndex) {
         var list = this.ranges;
 
         for (var i = startIndex || 0; i < list.length; i++) {
             var range = list[i];
-            var cmp = this.comparePoints(pos, range.end);
-
-            if (cmp > 0)
+            var cmpEnd = comparePoints(pos, range.end);
+            if (cmpEnd > 0)
                 continue;
-            if (cmp == 0)
-                return i;
-            cmp = this.comparePoints(pos, range.start);
-            if (cmp >= 0)
+            var cmpStart = comparePoints(pos, range.start);
+            if (cmpEnd === 0)
+                return excludeEdges && cmpStart !== 0 ? -i-2 : i;
+            if (cmpStart > 0 || (cmpStart === 0 && !excludeEdges))
                 return i;
 
             return -i-1;
@@ -62,17 +60,17 @@ var RangeList = function() {
     };
 
     this.add = function(range) {
-        var startIndex = this.pointIndex(range.start);
+        var excludeEdges = !range.isEmpty();
+        var startIndex = this.pointIndex(range.start, excludeEdges);
         if (startIndex < 0)
             startIndex = -startIndex - 1;
 
-        var endIndex = this.pointIndex(range.end, startIndex);
+        var endIndex = this.pointIndex(range.end, excludeEdges, startIndex);
 
         if (endIndex < 0)
             endIndex = -endIndex - 1;
         else
             endIndex++;
-
         return this.ranges.splice(startIndex, endIndex - startIndex, range);
     };
 
@@ -95,18 +93,23 @@ var RangeList = function() {
     this.merge = function() {
         var removed = [];
         var list = this.ranges;
+        
+        list = list.sort(function(a, b) {
+            return comparePoints(a.start, b.start);
+        });
+        
         var next = list[0], range;
         for (var i = 1; i < list.length; i++) {
             range = next;
             next = list[i];
-            var cmp = this.comparePoints(range.end, next.start);
+            var cmp = comparePoints(range.end, next.start);
             if (cmp < 0)
                 continue;
 
-            if (cmp == 0 && !(range.isEmpty() || next.isEmpty()))
+            if (cmp == 0 && !range.isEmpty() && !next.isEmpty())
                 continue;
 
-            if (this.comparePoints(range.end, next.end) < 0) {
+            if (comparePoints(range.end, next.end) < 0) {
                 range.end.row = next.end.row;
                 range.end.column = next.end.column;
             }
@@ -116,6 +119,8 @@ var RangeList = function() {
             next = range;
             i--;
         }
+        
+        this.ranges = list;
 
         return removed;
     };
@@ -199,10 +204,22 @@ var RangeList = function() {
                 break;
 
             if (r.start.row == startRow && r.start.column >= start.column ) {
-                r.start.column += colDiff;
-                r.start.row += lineDif;
+                if (r.start.column == start.column && this.$insertRight) {
+                    // do nothing
+                } else {
+                    r.start.column += colDiff;
+                    r.start.row += lineDif;
+                }
             }
-            if (r.end.row == startRow && r.end.column >=  start.column) {
+            if (r.end.row == startRow && r.end.column >= start.column) {
+                if (r.end.column == start.column && this.$insertRight) {
+                    continue;
+                }
+                // special handling for the case when two ranges share an edge
+                if (r.end.column == start.column && colDiff > 0 && i < n - 1) {                
+                    if (r.end.column > r.start.column && r.end.column == ranges[i+1].start.column)
+                        r.end.column -= colDiff;
+                }
                 r.end.column += colDiff;
                 r.end.row += lineDif;
             }

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/range_list_test.js

@@ -72,6 +72,26 @@ module.exports = {
         assert.equal(rangeList.pointIndex({row: 8, column: 9}), 2);
         assert.equal(rangeList.pointIndex({row: 18, column: 9}), -4);
     },
+    
+    "test: rangeList pointIndex excludeEdges": function() {
+        var rangeList = new RangeList();
+        rangeList.ranges = [
+            new Range(1,2,3,4),
+            new Range(4,2,5,4),
+            new Range(8,8,9,9),
+            new Range(10,10,10,10)
+        ];
+
+        assert.equal(rangeList.pointIndex({row: 0, column: 1}, true), -1);
+        assert.equal(rangeList.pointIndex({row: 1, column: 2}, true), -1);
+        assert.equal(rangeList.pointIndex({row: 1, column: 3}, true), 0);
+        assert.equal(rangeList.pointIndex({row: 3, column: 4}, true), -2);
+        assert.equal(rangeList.pointIndex({row: 4, column: 1}, true), -2);
+        assert.equal(rangeList.pointIndex({row: 5, column: 1}, true), 1);
+        assert.equal(rangeList.pointIndex({row: 8, column: 9}, true), 2);
+        assert.equal(rangeList.pointIndex({row: 10, column: 10}, true), 3);
+        assert.equal(rangeList.pointIndex({row: 18, column: 9}, true), -5);
+    },
 
     "test: rangeList add": function() {
         var rangeList = new RangeList();
@@ -153,7 +173,6 @@ module.exports = {
         rangeList.substractPoint({row: 6, column: 7});
         assert.equal(rangeList.ranges.length, 2);
     }
-
 };
 
 });

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/range_test.js

@@ -167,7 +167,7 @@ module.exports = {
             "juhu",
             "12\t\t34",
             "ぁぁa",
-            "\t\t34",
+            "\t\t34"
         ]);
         
         var range = new Range(0, 0, 0, 3);

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/renderloop.js

@@ -55,7 +55,7 @@ var RenderLoop = function(onRender, win) {
         //this.onRender(change);
         //return;
         this.changes = this.changes | change;
-        if (!this.pending) {
+        if (!this.pending && this.changes) {
             this.pending = true;
             var _self = this;
             event.nextFrame(function() {

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/requirejs/text.js

@@ -35,17 +35,18 @@
 (function() {
     
 var globalRequire = typeof require != "undefined" && require;
- 
+if (typeof define !== "function") // running in webpack
+    return module.exports = function(source) { return source; };
+
 define(function (require, exports, module) {
     "use strict";
-    
-    exports.load = function (name, req, onLoad, config) {
-        //Using special require.nodeRequire, something added by r.js.
-        if (globalRequire && globalRequire.nodeRequire)
-            onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8'));
-        else
+    if (globalRequire && globalRequire.nodeRequire) {
+        module.exports = globalRequire.nodeRequire(require.toUrl("./text_build"));
+    } else {
+        exports.load = function(name, req, onLoad, config) {    
             require("../lib/net").get(req.toUrl(name), onLoad);
-    };
+        };
+    }
 });
 
 })();

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/requirejs/text_build.js

@@ -0,0 +1,60 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * used by r.js during build
+ */
+ 
+"use strict";
+exports.buildMap = Object.create(null);
+exports.load = function(name, req, onLoad, config) {
+    var buildMap = exports.buildMap;
+    buildMap[name] = require('fs').readFileSync(req.toUrl(name), 'utf8');
+    onLoad(buildMap[name]);
+};
+exports.write = function(pluginName, moduleName, write, config) {
+    if (exports.buildMap[moduleName]) {
+        var content = exports.jsEscape(exports.buildMap[moduleName]);
+        write.asModule(pluginName + "!" + moduleName,
+           "define(function () { return '" +
+               content +
+           "';});\n");
+    }
+};
+exports.jsEscape = function(content) {
+    return content.replace(/(['\\])/g, '\\$1')
+        .replace(/[\f]/g, "\\f")
+        .replace(/[\b]/g, "\\b")
+        .replace(/[\n]/g, "\\n")
+        .replace(/[\t]/g, "\\t")
+        .replace(/[\r]/g, "\\r")
+        .replace(/[\u2028]/g, "\\u2028")
+        .replace(/[\u2029]/g, "\\u2029");
+};

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/scrollbar.js

@@ -37,9 +37,7 @@ var event = require("./lib/event");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 
 /**
- * 
- *
- * A set of methods for setting and retrieving the editor's scrollbar. 
+ * An abstract class representing a native scrollbar control.
  * @class ScrollBar
  **/
 
@@ -47,14 +45,11 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
  * Creates a new `ScrollBar`. `parent` is the owner of the scroll bar.
  * @param {DOMElement} parent A DOM element 
  *
- * 
- *
- * 
  * @constructor
  **/
 var ScrollBar = function(parent) {
     this.element = dom.createElement("div");
-    this.element.className = "ace_scrollbar";
+    this.element.className = "ace_scrollbar ace_scrollbar" + this.classSuffix;
 
     this.inner = dom.createElement("div");
     this.inner.className = "ace_scrollbar-inner";
@@ -62,47 +57,79 @@ var ScrollBar = function(parent) {
 
     parent.appendChild(this.element);
 
-    // in OSX lion the scrollbars appear to have no width. In this case resize
-    // the to show the scrollbar but still pretend that the scrollbar has a width
+    this.setVisible(false);
+    this.skipEvent = false;
+
+    event.addListener(this.element, "scroll", this.onScroll.bind(this));
+    event.addListener(this.element, "mousedown", event.preventDefault);
+};
+
+(function() {
+    oop.implement(this, EventEmitter);
+
+    this.setVisible = function(isVisible) {
+        this.element.style.display = isVisible ? "" : "none";
+        this.isVisible = isVisible;
+    };
+}).call(ScrollBar.prototype);
+
+/**
+ * Represents a vertical scroll bar.
+ * @class VScrollBar
+ **/
+
+/**
+ * Creates a new `VScrollBar`. `parent` is the owner of the scroll bar.
+ * @param {DOMElement} parent A DOM element
+ * @param {Object} renderer An editor renderer
+ *
+ * @constructor
+ **/
+var VScrollBar = function(parent, renderer) {
+    ScrollBar.call(this, parent);
+    this.scrollTop = 0;
+
+    // in OSX lion the scrollbars appear to have no width. In this case resize the
+    // element to show the scrollbar but still pretend that the scrollbar has a width
     // of 0px
     // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
     // make element a little bit wider to retain scrollbar when page is zoomed 
+    renderer.$scrollbarWidth = 
     this.width = dom.scrollbarWidth(parent.ownerDocument);
+    this.inner.style.width =
     this.element.style.width = (this.width || 15) + 5 + "px";
-
-    event.addListener(this.element, "scroll", this.onScroll.bind(this));
 };
 
+oop.inherits(VScrollBar, ScrollBar);
+
 (function() {
-    oop.implement(this, EventEmitter);
+
+    this.classSuffix = '-v';
 
     /**
      * Emitted when the scroll bar, well, scrolls.
      * @event scroll
      * @param {Object} e Contains one property, `"data"`, which indicates the current scroll top position
-     *
-     * 
-     *
      **/
     this.onScroll = function() {
-        this._emit("scroll", {data: this.element.scrollTop});
+        if (!this.skipEvent) {
+            this.scrollTop = this.element.scrollTop;
+            this._emit("scroll", {data: this.scrollTop});
+        }
+        this.skipEvent = false;
     };
 
     /**
-     * 
      * Returns the width of the scroll bar.
      * @returns {Number}
      **/
     this.getWidth = function() {
-        return this.width;
+        return this.isVisible ? this.width : 0;
     };
 
     /**
      * Sets the height of the scroll bar, in pixels.
      * @param {Number} height The new height
-     *
-     * 
-     *
      **/
     this.setHeight = function(height) {
         this.element.style.height = height + "px";
@@ -111,29 +138,133 @@ var ScrollBar = function(parent) {
     /**
      * Sets the inner height of the scroll bar, in pixels.
      * @param {Number} height The new inner height
-     *
-     * 
-     *
+     * @deprecated Use setScrollHeight instead
      **/
     this.setInnerHeight = function(height) {
         this.inner.style.height = height + "px";
     };
 
+    /**
+     * Sets the scroll height of the scroll bar, in pixels.
+     * @param {Number} height The new scroll height
+     **/
+    this.setScrollHeight = function(height) {
+        this.inner.style.height = height + "px";
+    };
 
-    // TODO: on chrome 17+ for small zoom levels after calling this function
-    // this.element.scrollTop != scrollTop which makes page to scroll up.
     /**
      * Sets the scroll top of the scroll bar.
      * @param {Number} scrollTop The new scroll top
-     *
-     * 
-     *
      **/
     this.setScrollTop = function(scrollTop) {
-        this.element.scrollTop = scrollTop;
+        // on chrome 17+ for small zoom levels after calling this function
+        // this.element.scrollTop != scrollTop which makes page to scroll up.
+        if (this.scrollTop != scrollTop) {
+            this.skipEvent = true;
+            this.scrollTop = this.element.scrollTop = scrollTop;
+        }
     };
 
-}).call(ScrollBar.prototype);
+}).call(VScrollBar.prototype);
+
+/**
+ * Represents a horisontal scroll bar.
+ * @class HScrollBar
+ **/
+
+/**
+ * Creates a new `HScrollBar`. `parent` is the owner of the scroll bar.
+ * @param {DOMElement} parent A DOM element
+ * @param {Object} renderer An editor renderer
+ *
+ * @constructor
+ **/
+var HScrollBar = function(parent, renderer) {
+    ScrollBar.call(this, parent);
+    this.scrollLeft = 0;
+
+    // in OSX lion the scrollbars appear to have no width. In this case resize the
+    // element to show the scrollbar but still pretend that the scrollbar has a width
+    // of 0px
+    // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
+    // make element a little bit wider to retain scrollbar when page is zoomed 
+    this.height = renderer.$scrollbarWidth;
+    this.inner.style.height =
+    this.element.style.height = (this.height || 15) + 5 + "px";
+};
+
+oop.inherits(HScrollBar, ScrollBar);
+
+(function() {
+
+    this.classSuffix = '-h';
+
+    /**
+     * Emitted when the scroll bar, well, scrolls.
+     * @event scroll
+     * @param {Object} e Contains one property, `"data"`, which indicates the current scroll left position
+     **/
+    this.onScroll = function() {
+        if (!this.skipEvent) {
+            this.scrollLeft = this.element.scrollLeft;
+            this._emit("scroll", {data: this.scrollLeft});
+        }
+        this.skipEvent = false;
+    };
+
+    /**
+     * Returns the height of the scroll bar.
+     * @returns {Number}
+     **/
+    this.getHeight = function() {
+        return this.isVisible ? this.height : 0;
+    };
+
+    /**
+     * Sets the width of the scroll bar, in pixels.
+     * @param {Number} width The new width
+     **/
+    this.setWidth = function(width) {
+        this.element.style.width = width + "px";
+    };
+
+    /**
+     * Sets the inner width of the scroll bar, in pixels.
+     * @param {Number} width The new inner width
+     * @deprecated Use setScrollWidth instead
+     **/
+    this.setInnerWidth = function(width) {
+        this.inner.style.width = width + "px";
+    };
+
+    /**
+     * Sets the scroll width of the scroll bar, in pixels.
+     * @param {Number} width The new scroll width
+     **/
+    this.setScrollWidth = function(width) {
+        this.inner.style.width = width + "px";
+    };
+
+    /**
+     * Sets the scroll left of the scroll bar.
+     * @param {Number} scrollTop The new scroll left
+     **/
+    this.setScrollLeft = function(scrollLeft) {
+        // on chrome 17+ for small zoom levels after calling this function
+        // this.element.scrollTop != scrollTop which makes page to scroll up.
+        if (this.scrollLeft != scrollLeft) {
+            this.skipEvent = true;
+            this.scrollLeft = this.element.scrollLeft = scrollLeft;
+        }
+    };
+
+}).call(HScrollBar.prototype);
+
+
+exports.ScrollBar = VScrollBar; // backward compatibility
+exports.ScrollBarV = VScrollBar; // backward compatibility
+exports.ScrollBarH = HScrollBar; // backward compatibility
 
-exports.ScrollBar = ScrollBar;
+exports.VScrollBar = VScrollBar;
+exports.HScrollBar = HScrollBar;
 });