gollum 3.1.2 → 3.1.3

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

@@ -37,7 +37,6 @@ var oop = require("./lib/oop");
 /**
  * @class PlaceHolder
  *
- * 
  **/
 
 /**
@@ -47,7 +46,6 @@ var oop = require("./lib/oop");
  * - others (String):
  * - mainClass (String):
  * - othersClass (String):
- *
  * 
  * @constructor
  **/
@@ -93,6 +91,10 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
         var doc = this.doc;
         var session = this.session;
         var pos = this.$pos;
+        
+        this.selectionBefore = session.selection.toJSON();
+        if (session.selection.inMultiSelectMode)
+            session.selection.toSingleRange();
 
         this.pos = doc.createAnchor(pos.row, pos.column);
         this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false);
@@ -218,9 +220,9 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
      **/
 
     this.onCursorChange = function(event) {
-        if (this.$updating) return;
+        if (this.$updating || !this.session) return;
         var pos = this.session.selection.getCursor();
-        if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
+        if (pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
             this.showOtherMarkers();
             this._emit("cursorEnter", event);
         } else {
@@ -245,6 +247,7 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
             this.others[i].detach();
         }
         this.session.setUndoSelect(true);
+        this.session = null;
     };
     
     /**
@@ -261,6 +264,8 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
         for (var i = 0; i < undosRequired; i++) {
             undoManager.undo(true);
         }
+        if (this.selectionBefore)
+            this.session.selection.fromJSON(this.selectionBefore);
     };
 }).call(PlaceHolder.prototype);
 

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

@@ -43,6 +43,7 @@ var assert = require("./test/assertions");
 var JavaScriptMode = require("./mode/javascript").Mode;
 var PlaceHolder = require("./placeholder").PlaceHolder;
 var UndoManager = require("./undomanager").UndoManager;
+require("./multi_select")
 
 module.exports = {
 
@@ -89,7 +90,7 @@ module.exports = {
             editor.insert('v');
             assert.equal(session.doc.getValue(), "var v$a = 10;\nconsole.log(v$a, v$a);");
             next();
-        }, 10);
+        }, 20);
     },
 
    "test: detaching placeholder" : function() {

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

@@ -3,7 +3,7 @@
  *
  * 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
@@ -14,7 +14,7 @@
  *     * 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
@@ -30,10 +30,10 @@
 
 define(function(require, exports, module) {
 "use strict";
-
+var comparePoints = function(p1, p2) {
+    return p1.row - p2.row || p1.column - p2.column;
+};
 /**
- * 
- *
  * This object is used in various places to indicate a region within the editor. To better visualize how this works, imagine a rectangle. Each quadrant of the rectangle is analogus to a range, as ranges contain a starting row and starting column, and an ending row, and ending column.
  * @class Range
  **/
@@ -45,7 +45,6 @@ define(function(require, exports, module) {
  * @param {Number} endRow The ending row
  * @param {Number} endColumn The ending column
  *
- * 
  * @constructor
  **/
 var Range = function(startRow, startColumn, endRow, endColumn) {
@@ -62,33 +61,32 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
 
 (function() {
     /**
-     * Returns `true` if and only if the starting row and column, and ending tow and column, are equivalent to those given by `range`.
+     * Returns `true` if and only if the starting row and column, and ending row and column, are equivalent to those given by `range`.
      * @param {Range} range A range to check against
      *
-     * 
-     * @return Boolean
-     **/ 
+     * @return {Boolean}
+     **/
     this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
+        return this.start.row === range.start.row &&
+            this.end.row === range.end.row &&
+            this.start.column === range.start.column &&
+            this.end.column === range.end.column;
     };
 
     /**
-     * 
+     *
      * Returns a string containing the range's row and column information, given like this:
      * ```
      *    [start.row/start.column] -> [end.row/end.column]
      * ```
-     * @return String
-     **/ 
+     * @return {String}
+     **/
     this.toString = function() {
         return ("Range: [" + this.start.row + "/" + this.start.column +
             "] -> [" + this.end.row + "/" + this.end.column + "]");
     };
 
-    /** 
+    /**
      *
      * Returns `true` if the `row` and `column` provided are within the given range. This can better be expressed as returning `true` if:
      * ```javascript
@@ -99,17 +97,16 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * @param {Number} column A column to check for
      * @returns {Boolean}
      * @related Range.compare
-     **/ 
+     **/
 
     this.contains = function(row, column) {
         return this.compare(row, column) == 0;
     };
 
-    /** 
+    /**
      * Compares `this` range (A) with another range (B).
      * @param {Range} range A range to compare with
-     * 
-     * 
+     *
      * @related Range.compare
      * @returns {Number} This method returns one of the following numbers:<br/>
      * <br/>
@@ -119,7 +116,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * * `+1`: (B) begins inside of (A) but ends outside of (A)<br/>
      * * `+2`: (B) is after (A) and doesn't intersect with (A)<br/>
      * * `42`: FTW state: (B) ends in (A) but starts outside of (A)
-     **/ 
+     **/
     this.compareRange = function(range) {
         var cmp,
             end = range.end,
@@ -149,12 +146,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         }
     };
 
-    /** 
-     *
+    /**
      * Checks the row and column points of `p` with the row and column points of the calling range.
      *
      * @param {Range} p A point to compare with
-     * 
+     *
      * @related Range.compare
      * @returns {Number} This method returns one of the following numbers:<br/>
      * * `0` if the two points are exactly equal<br/>
@@ -168,19 +164,18 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * If the ending row of the calling range is equal to `p.row`, and:<br/>
      * * `p.column` is less than or equal to the calling range's ending column, this returns `0`<br/>
      * * Otherwise, it returns 1<br/>
-     **/ 
+     **/
     this.comparePoint = function(p) {
         return this.compare(p.row, p.column);
     };
 
-    /** 
+    /**
      * Checks the start and end points of `range` and compares them to the calling range. Returns `true` if the `range` is contained within the caller's range.
      * @param {Range} range A range to compare with
      *
      * @returns {Boolean}
      * @related Range.comparePoint
-     * 
-     **/ 
+     **/
     this.containsRange = function(range) {
         return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
     };
@@ -189,7 +184,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * Returns `true` if passed in `range` intersects with the one calling this method.
      * @param {Range} range A range to compare with
      *
-     * 
      * @returns {Boolean}
      **/
     this.intersects = function(range) {
@@ -202,7 +196,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
      *
-     * 
      * @returns {Boolean}
      **/
     this.isEnd = function(row, column) {
@@ -214,9 +207,8 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
      *
-     * 
      * @returns {Boolean}
-     **/ 
+     **/
     this.isStart = function(row, column) {
         return this.start.row == row && this.start.column == column;
     };
@@ -226,9 +218,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * @param {Number} row A row point to set
      * @param {Number} column A column point to set
      *
-     * 
-     * 
-     **/ 
+     **/
     this.setStart = function(row, column) {
         if (typeof row == "object") {
             this.start.column = row.column;
@@ -244,9 +234,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * @param {Number} row A row point to set
      * @param {Number} column A column point to set
      *
-     * 
-     *
-     **/ 
+     **/
     this.setEnd = function(row, column) {
         if (typeof row == "object") {
             this.end.column = row.column;
@@ -257,15 +245,15 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         }
     };
 
-    /** 
+    /**
      * Returns `true` if the `row` and `column` are within the given range.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
      *
-     * 
+     *
      * @returns {Boolean}
      * @related Range.compare
-     **/ 
+     **/
     this.inside = function(row, column) {
         if (this.compare(row, column) == 0) {
             if (this.isEnd(row, column) || this.isStart(row, column)) {
@@ -277,15 +265,14 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         return false;
     };
 
-    /** 
+    /**
      * Returns `true` if the `row` and `column` are within the given range's starting points.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
      *
-     * 
      * @returns {Boolean}
      * @related Range.compare
-     **/ 
+     **/
     this.insideStart = function(row, column) {
         if (this.compare(row, column) == 0) {
             if (this.isEnd(row, column)) {
@@ -297,16 +284,15 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         return false;
     };
 
-    /** 
+    /**
      * Returns `true` if the `row` and `column` are within the given range's ending points.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
      *
-     * 
      * @returns {Boolean}
      * @related Range.compare
-     * 
-     **/ 
+     *
+     **/
     this.insideEnd = function(row, column) {
         if (this.compare(row, column) == 0) {
             if (this.isStart(row, column)) {
@@ -318,11 +304,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         return false;
     };
 
-    /** 
+    /**
      * Checks the row and column points with the row and column points of the calling range.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
-     * 
+     *
      *
      * @returns {Number} This method returns one of the following numbers:<br/>
      * `0` if the two points are exactly equal <br/>
@@ -363,8 +349,6 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * Checks the row and column points with the row and column points of the calling range.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
-     * 
-     *
      *
      * @returns {Number} This method returns one of the following numbers:<br/>
      * <br/>
@@ -393,7 +377,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
      * Checks the row and column points with the row and column points of the calling range.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
-     * 
+     *
      *
      * @returns {Number} This method returns one of the following numbers:<br/>
      * `0` if the two points are exactly equal<br/>
@@ -416,11 +400,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         }
     };
 
-    /** 
+    /**
      * Checks the row and column points with the row and column points of the calling range.
      * @param {Number} row A row point to compare with
      * @param {Number} column A column point to compare with
-     * 
+     *
      *
      * @returns {Number} This method returns one of the following numbers:<br/>
      * * `1` if the ending row of the calling range is equal to `row`, and the ending column of the calling range is equal to `column`<br/>
@@ -439,51 +423,34 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         }
     };
 
-    /** 
+    /**
      * Returns the part of the current `Range` that occurs within the boundaries of `firstRow` and `lastRow` as a new `Range` object.
      * @param {Number} firstRow The starting row
      * @param {Number} lastRow The ending row
      *
-     * 
+     *
      * @returns {Range}
     **/
     this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
+        if (this.end.row > lastRow)
+            var end = {row: lastRow + 1, column: 0};
+        else if (this.end.row < firstRow)
+            var end = {row: firstRow, column: 0};
 
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
+        if (this.start.row > lastRow)
+            var start = {row: lastRow + 1, column: 0};
+        else if (this.start.row < firstRow)
+            var start = {row: firstRow, column: 0};
 
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
         return Range.fromPoints(start || this.start, end || this.end);
     };
 
-    /** 
+    /**
      * Changes the row and column points for the calling range for both the starting and ending points.
      * @param {Number} row A new row to extend to
      * @param {Number} column A new column to extend to
      *
-     * 
+     *
      * @returns {Range} The original range with the new row
     **/
     this.extend = function(row, column) {
@@ -500,11 +467,11 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
     };
 
     this.isEmpty = function() {
-        return (this.start.row == this.end.row && this.start.column == this.end.column);
+        return (this.start.row === this.end.row && this.start.column === this.end.column);
     };
 
-    /** 
-     * 
+    /**
+     *
      * Returns `true` if the range spans across multiple lines.
      * @returns {Boolean}
     **/
@@ -512,8 +479,8 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         return (this.start.row !== this.end.row);
     };
 
-    /** 
-     * 
+    /**
+     *
      * Returns a duplicate of the calling range.
      * @returns {Range}
     **/
@@ -521,7 +488,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
         return Range.fromPoints(this.start, this.end);
     };
 
-    /** 
+    /**
      *
      * Returns a range containing the starting and ending rows of the original range, but with a column value of `0`.
      * @returns {Range}
@@ -533,38 +500,50 @@ var Range = function(startRow, startColumn, endRow, endColumn) {
             return new Range(this.start.row, 0, this.end.row, 0)
     };
 
-    /** 
+    /**
      * Given the current `Range`, this function converts those starting and ending points into screen positions, and then returns a new `Range` object.
      * @param {EditSession} session The `EditSession` to retrieve coordinates from
-     * 
-     * 
+     *
+     *
      * @returns {Range}
     **/
     this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
+        var screenPosStart = session.documentToScreenPosition(this.start);
+        var screenPosEnd = session.documentToScreenPosition(this.end);
 
         return new Range(
             screenPosStart.row, screenPosStart.column,
             screenPosEnd.row, screenPosEnd.column
         );
     };
+    
+    
+    /* experimental */
+    this.moveBy = function(row, column) {
+        this.start.row += row;
+        this.start.column += column;
+        this.end.row += row;
+        this.end.column += column;
+    };
 
 }).call(Range.prototype);
 
-/** 
+/**
  * Creates and returns a new `Range` based on the row and column of the given parameters.
  * @param {Range} start A starting point to use
  * @param {Range} end An ending point to use
- * 
- * 
+ *
  * @returns {Range}
 **/
 Range.fromPoints = function(start, end) {
     return new Range(start.row, start.column, end.row, end.column);
 };
+Range.comparePoints = comparePoints;
+
+Range.comparePoints = function(p1, p2) {
+    return p1.row - p2.row || p1.column - p2.column;
+};
+
 
 exports.Range = Range;
 });