gollum 3.1.2 → 3.1.3

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

@@ -102,8 +102,8 @@ var Search = function() {
      * @returns {Range}
     **/
     this.find = function(session) {
-        var iterator = this.$matchIterator(session, this.$options);
-
+        var options = this.$options;
+        var iterator = this.$matchIterator(session, options);
         if (!iterator)
             return false;
 
@@ -111,7 +111,13 @@ var Search = function() {
         iterator.forEach(function(range, row, offset) {
             if (!range.start) {
                 var column = range.offset + (offset || 0);
-                firstRange = new Range(row, column, row, column+range.length);
+                firstRange = new Range(row, column, row, column + range.length);
+                if (!range.length && options.start && options.start.start
+                    && options.skipCurrent != false && firstRange.isEqual(options.start)
+                ) {
+                    firstRange = null;
+                    return false;
+                }
             } else
                 firstRange = range;
             return true;
@@ -125,7 +131,7 @@ var Search = function() {
      * @param {EditSession} session The session to search with
      *
      * 
-     * @returns [Range]
+     * @returns {[Range]}
     **/
     this.findAll = function(session) {
         var options = this.$options;
@@ -143,20 +149,27 @@ var Search = function() {
         if (options.$isMultiLine) {
             var len = re.length;
             var maxRow = lines.length - len;
-            for (var row = re.offset || 0; row <= maxRow; row++) {
+            var prevRange;
+            outer: for (var row = re.offset || 0; row <= maxRow; row++) {
                 for (var j = 0; j < len; j++)
                     if (lines[row + j].search(re[j]) == -1)
-                        break;
+                        continue outer;
                 
                 var startLine = lines[row];
                 var line = lines[row + len - 1];
-                var startIndex = startLine.match(re[0])[0].length;
+                var startIndex = startLine.length - startLine.match(re[0])[0].length;
                 var endIndex = line.match(re[len - 1])[0].length;
-
-                ranges.push(new Range(
-                    row, startLine.length - startIndex,
-                    row + len - 1, endIndex
+                
+                if (prevRange && prevRange.end.row === row &&
+                    prevRange.end.column > startIndex
+                ) {
+                    continue;
+                }
+                ranges.push(prevRange = new Range(
+                    row, startIndex, row + len - 1, endIndex
                 ));
+                if (len > 2)
+                    row = row + len - 2;
             }
         } else {
             for (var i = 0; i < lines.length; i++) {
@@ -177,7 +190,12 @@ var Search = function() {
 
             while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == range.end.row)
                 j--;
-            return ranges.slice(i, j + 1);
+            
+            ranges = ranges.slice(i, j + 1);
+            for (i = 0, j = ranges.length; i < j; i++) {
+                ranges[i].start.row += range.start.row;
+                ranges[i].end.row += range.start.row;
+            }
         }
 
         return ranges;
@@ -228,8 +246,7 @@ var Search = function() {
         if (!re)
             return false;
 
-        var self = this, callback, backwards = options.backwards;
-
+        var callback;
         if (options.$isMultiLine) {
             var len = re.length;
             var matchIterator = function(line, row, offset) {
@@ -254,7 +271,7 @@ var Search = function() {
                 if (callback(range))
                     return true;
             };
-        } else if (backwards) {
+        } else if (options.backwards) {
             var matchIterator = function(line, row, startIndex) {
                 var matches = lang.getMatchOffsets(line, re);
                 for (var i = matches.length-1; i >= 0; i--)
@@ -269,16 +286,18 @@ var Search = function() {
                         return true;
             };
         }
+        
+        var lineIterator = this.$lineIterator(session, options);
 
         return {
             forEach: function(_callback) {
                 callback = _callback;
-                self.$lineIterator(session, options).forEach(matchIterator);
+                lineIterator.forEach(matchIterator);
             }
         };
     };
 
-    this.$assembleRegExp = function(options) {
+    this.$assembleRegExp = function(options, $disableFakeMultiline) {
         if (options.needle instanceof RegExp)
             return options.re = options.needle;
 
@@ -293,9 +312,9 @@ var Search = function() {
         if (options.wholeWord)
             needle = "\\b" + needle + "\\b";
 
-        var modifier = options.caseSensitive ? "g" : "gi";
+        var modifier = options.caseSensitive ? "gm" : "gmi";
 
-        options.$isMultiLine = /[\n\r]/.test(needle);
+        options.$isMultiLine = !$disableFakeMultiline && /[\n\r]/.test(needle);
         if (options.$isMultiLine)
             return options.re = this.$assembleMultilineRegExp(needle, modifier);
 

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

@@ -71,9 +71,7 @@ var SearchHighlight = function(regExp, clazz, type) {
 
             for (var j = ranges.length; j --; ) {
                 markerLayer.drawSingleLineMarker(
-                    html, ranges[j].toScreenRange(session), this.clazz, config,
-                    null, this.type
-                );
+                    html, ranges[j].toScreenRange(session), this.clazz, config);
             }
         }
     };

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

@@ -36,6 +36,8 @@ define(function(require, exports, module) {
 "use strict";
 
 var EditSession = require("./edit_session").EditSession;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var Editor = require("./editor").Editor;
 var Search = require("./search").Search;
 var assert = require("./test/assertions");
 
@@ -452,6 +454,37 @@ module.exports = {
         assert.position(ranges[0].start, 0, 0);
         assert.position(ranges[0].end, 0, 3);
     },
+
+    "test: find next empty range" : function() {
+        var session = new EditSession("foo foobar foo");
+        var editor = new Editor(new MockRenderer(), session);
+        
+        var options = {
+            needle: "o*",
+            wrap: true,
+            regExp: true,
+            backwards: false
+        };
+        var positions = [4, 5.2, 7, 8, 9, 10, 11, 12.2, 14, 0, 1.2, 3];
+        
+        session.selection.moveCursorTo(0, 3);
+        for (var i = 0; i < 12; i++) {
+            editor.find(options)
+            var range = editor.selection.getRange();
+            var start = range.start.column;
+            var len = range.end.column - start;
+            assert.equal(start + 0.1 * len, positions[i])
+        }
+        options.backwards = true;
+        positions = [1.2, 1, 0, 14, 12.2, 12, 11, 10, 9, 8, 7, 5.2, 5, 4, 3];
+        for (var i = 0; i < 16; i++) {
+            editor.find(options);
+            var range = editor.selection.getRange();
+            var start = range.start.column;
+            var len = range.end.column - start;
+            console.log(start + 0.1 * len)
+        }
+    }
 };
 
 });

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/selection.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
@@ -37,10 +37,9 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var Range = require("./range").Range;
 
 /**
- * 
  * Contains the cursor position and the text selection of an edit session.
  *
- * The row/columns used in the selection are in document coordinates representing ths coordinates as thez appear in the document before applying soft wrap and folding.
+ * The row/columns used in the selection are in document coordinates representing the coordinates as they appear in the document before applying soft wrap and folding.
  * @class Selection
  **/
 
@@ -49,21 +48,15 @@ var Range = require("./range").Range;
  * Emitted when the cursor position changes.
  * @event changeCursor
  *
- * 
- *
 **/
 /**
  * Emitted when the cursor selection changes.
- *  @event changeSelection
- *
  * 
- *
+ *  @event changeSelection
 **/
 /**
  * Creates a new `Selection` object.
  * @param {EditSession} session The session to use
- *
- * 
  * 
  * @constructor
  **/
@@ -95,7 +88,7 @@ var Selection = function(session) {
     oop.implement(this, EventEmitter);
 
     /**
-    * 
+    *
     * Returns `true` if the selection is empty.
     * @returns {Boolean}
     **/
@@ -106,7 +99,7 @@ var Selection = function(session) {
         ));
     };
 
-    /** 
+    /**
     * Returns `true` if the selection is a multi-line.
     * @returns {Boolean}
     **/
@@ -118,9 +111,9 @@ var Selection = function(session) {
         return this.getRange().isMultiLine();
     };
 
-    /** 
-    * Gets the current position of the cursor.
-    * @returns {Number}
+    /**
+    * Returns an object containing the `row` and `column` current position of the cursor.
+    * @returns {Object}
     **/
     this.getCursor = function() {
         return this.lead.getPosition();
@@ -131,7 +124,7 @@ var Selection = function(session) {
     * @param {Number} row The new row
     * @param {Number} column The new column
     *
-    * 
+    *
     **/
     this.setSelectionAnchor = function(row, column) {
         this.anchor.setPosition(row, column);
@@ -144,17 +137,19 @@ var Selection = function(session) {
 
     /**
     * Returns an object containing the `row` and `column` of the calling selection anchor.
+    *
+    * @returns {Object}
     * @related Anchor.getPosition
     **/
     this.getSelectionAnchor = function() {
         if (this.$isEmpty)
-            return this.getSelectionLead()
+            return this.getSelectionLead();
         else
             return this.anchor.getPosition();
     };
 
     /**
-    * 
+    *
     * Returns an object containing the `row` and `column` of the calling selection lead.
     * @returns {Object}
     **/
@@ -166,14 +161,14 @@ var Selection = function(session) {
     * Shifts the selection up (or down, if [[Selection.isBackwards `isBackwards()`]] is true) the given number of columns.
     * @param {Number} columns The number of columns to shift by
     *
-    * 
+    *
     *
     **/
     this.shiftSelection = function(columns) {
         if (this.$isEmpty) {
             this.moveCursorTo(this.lead.row, this.lead.column + columns);
             return;
-        };
+        }
 
         var anchor = this.getSelectionAnchor();
         var lead = this.getSelectionLead();
@@ -243,8 +238,9 @@ var Selection = function(session) {
     * @param {Range} range The range of text to select
     * @param {Boolean} reverse Indicates if the range should go backwards (`true`) or not
     *
-    * 
+    *
     * @method setSelectionRange
+    * @alias setRange
     **/
     this.setRange =
     this.setSelectionRange = function(range, reverse) {
@@ -255,6 +251,8 @@ var Selection = function(session) {
             this.setSelectionAnchor(range.start.row, range.start.column);
             this.selectTo(range.end.row, range.end.column);
         }
+        if (this.getRange().isEmpty())
+            this.$isEmpty = true;
         this.$desiredColumn = null;
     };
 
@@ -271,7 +269,7 @@ var Selection = function(session) {
     * @param {Number} row The row to select to
     * @param {Number} column The column to select to
     *
-    * 
+    *
     *
     **/
     this.selectTo = function(row, column) {
@@ -284,7 +282,7 @@ var Selection = function(session) {
     * Moves the selection cursor to the row and column indicated by `pos`.
     * @param {Object} pos An object containing the row and column
     *
-    * 
+    *
     *
     **/
     this.selectToPosition = function(pos) {
@@ -294,7 +292,28 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    * Moves the selection cursor to the indicated row and column.
+    * @param {Number} row The row to select to
+    * @param {Number} column The column to select to
+    *
+    **/
+    this.moveTo = function(row, column) {
+        this.clearSelection();
+        this.moveCursorTo(row, column);
+    };
+
+    /**
+    * Moves the selection cursor to the row and column indicated by `pos`.
+    * @param {Object} pos An object containing the row and column
+    **/
+    this.moveToPosition = function(pos) {
+        this.clearSelection();
+        this.moveCursorToPosition(pos);
+    };
+
+
+    /**
+    *
     * Moves the selection up one row.
     **/
     this.selectUp = function() {
@@ -302,7 +321,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection down one row.
     **/
     this.selectDown = function() {
@@ -310,7 +329,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     *
     * Moves the selection right one column.
     **/
@@ -319,7 +338,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection left one column.
     **/
     this.selectLeft = function() {
@@ -327,7 +346,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the beginning of the current line.
     **/
     this.selectLineStart = function() {
@@ -335,7 +354,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the end of the current line.
     **/
     this.selectLineEnd = function() {
@@ -343,7 +362,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the end of the file.
     **/
     this.selectFileEnd = function() {
@@ -351,7 +370,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the start of the file.
     **/
     this.selectFileStart = function() {
@@ -359,7 +378,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the first word on the right.
     **/
     this.selectWordRight = function() {
@@ -367,14 +386,14 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the selection to the first word on the left.
     **/
     this.selectWordLeft = function() {
         this.$moveSelection(this.moveCursorWordLeft);
     };
 
-    /** 
+    /**
     * Moves the selection to highlight the entire word.
     * @related EditSession.getWordRange
     **/
@@ -386,16 +405,16 @@ var Selection = function(session) {
         }
         return this.session.getWordRange(row, column);
     };
-    
+
     /**
-    * 
+    *
     * Selects an entire word boundary.
     **/
     this.selectWord = function() {
         this.setSelectionRange(this.getWordRange());
     };
 
-    /** 
+    /**
     * Selects a word, including its right whitespace.
     * @related EditSession.getAWordRange
     **/
@@ -416,7 +435,7 @@ var Selection = function(session) {
         } else {
             rowEnd = rowStart;
         }
-        if (excludeLastChar)
+        if (excludeLastChar === true)
             return new Range(rowStart, 0, rowEnd, this.session.getLine(rowEnd).length);
         else
             return new Range(rowStart, 0, rowEnd + 1, 0);
@@ -430,7 +449,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor up one row.
     **/
     this.moveCursorUp = function() {
@@ -438,7 +457,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor down one row.
     **/
     this.moveCursorDown = function() {
@@ -446,7 +465,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor left one column.
     **/
     this.moveCursorLeft = function() {
@@ -455,7 +474,7 @@ var Selection = function(session) {
 
         if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
             this.moveCursorTo(fold.start.row, fold.start.column);
-        } else if (cursor.column == 0) {
+        } else if (cursor.column === 0) {
             // cursor is a line (start
             if (cursor.row > 0) {
                 this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
@@ -471,7 +490,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor right one column.
     **/
     this.moveCursorRight = function() {
@@ -496,7 +515,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the start of the line.
     **/
     this.moveCursorLineStart = function() {
@@ -514,21 +533,14 @@ var Selection = function(session) {
         );
 
         var leadingSpace = beforeCursor.match(/^\s*/);
-        if (leadingSpace[0].length == column) {
-            this.moveCursorTo(
-                firstColumnPosition.row, firstColumnPosition.column
-            );
-        }
-        else {
-            this.moveCursorTo(
-                firstColumnPosition.row,
-                firstColumnPosition.column + leadingSpace[0].length
-            );
-        }
+        // TODO find better way for emacs mode to override selection behaviors
+        if (leadingSpace[0].length != column && !this.session.$useEmacsStyleLineStart)
+            firstColumnPosition.column += leadingSpace[0].length;
+        this.moveCursorToPosition(firstColumnPosition);
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the end of the line.
     **/
     this.moveCursorLineEnd = function() {
@@ -547,7 +559,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the end of the file.
     **/
     this.moveCursorFileEnd = function() {
@@ -557,7 +569,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the start of the file.
     **/
     this.moveCursorFileStart = function() {
@@ -565,7 +577,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the word on the right.
     **/
     this.moveCursorLongWordRight = function() {
@@ -611,7 +623,7 @@ var Selection = function(session) {
     };
 
     /**
-    * 
+    *
     * Moves the cursor to the word on the left.
     **/
     this.moveCursorLongWordLeft = function() {
@@ -627,7 +639,7 @@ var Selection = function(session) {
 
         var str = this.session.getFoldStringAt(row, column, -1);
         if (str == null) {
-            str = this.doc.getLine(row).substring(0, column)
+            str = this.doc.getLine(row).substring(0, column);
         }
 
         var leftOfCursor = lang.stringReverse(str);
@@ -672,20 +684,20 @@ var Selection = function(session) {
             while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch))
                 index ++;
 
-            if (index <= 1) {
+            if (index < 1) {
                 tokenRe.lastIndex = 0;
                  while ((ch = rightOfCursor[index]) && !tokenRe.test(ch)) {
                     tokenRe.lastIndex = 0;
                     index ++;
                     if (whitespaceRe.test(ch)) {
                         if (index > 2) {
-                            index--
+                            index--;
                             break;
                         } else {
                             while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch))
                                 index ++;
                             if (index > 2)
-                                break
+                                break;
                         }
                     }
                 }
@@ -708,13 +720,13 @@ var Selection = function(session) {
 
         if (column == line.length) {
             var l = this.doc.getLength();
-            do {    
+            do {
                 row++;
-                rightOfCursor = this.doc.getLine(row)
-            } while (row < l && /^\s*$/.test(rightOfCursor))
-            
+                rightOfCursor = this.doc.getLine(row);
+            } while (row < l && /^\s*$/.test(rightOfCursor));
+
             if (!/^\s+/.test(rightOfCursor))
-                rightOfCursor = ""
+                rightOfCursor = "";
             column = 0;
         }
 
@@ -732,15 +744,15 @@ var Selection = function(session) {
             return this.moveCursorTo(fold.start.row, fold.start.column);
 
         var line = this.session.getLine(row).substring(0, column);
-        if (column == 0) {
-            do {    
+        if (column === 0) {
+            do {
                 row--;
                 line = this.doc.getLine(row);
-            } while (row > 0 && /^\s*$/.test(line))
-            
+            } while (row > 0 && /^\s*$/.test(line));
+
             column = line.length;
             if (!/\s+$/.test(line))
-                line = ""
+                line = "";
         }
 
         var leftOfCursor = lang.stringReverse(line);
@@ -764,11 +776,11 @@ var Selection = function(session) {
     };
 
     /**
-    * Moves the cursor to position indicated by the parameters. Negative numbers move the cursor backwards in the document. 
+    * Moves the cursor to position indicated by the parameters. Negative numbers move the cursor backwards in the document.
     * @param {Number} rows The number of rows to move by
     * @param {Number} chars The number of characters to move by
     *
-    * 
+    *
     * @related EditSession.documentToScreenPosition
     **/
     this.moveCursorBy = function(rows, chars) {
@@ -785,6 +797,11 @@ var Selection = function(session) {
         }
 
         var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
+        
+        if (rows !== 0 && chars === 0 && docPos.row === this.lead.row && docPos.column === this.lead.column) {
+            if (this.session.lineWidgets && this.session.lineWidgets[docPos.row])
+                docPos.row++;
+        }
 
         // move the cursor and update the desired column
         this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
@@ -794,7 +811,7 @@ var Selection = function(session) {
     * Moves the selection to the position indicated by its `row` and `column`.
     * @param {Object} position The position to move to
     *
-    * 
+    *
     **/
     this.moveCursorToPosition = function(position) {
         this.moveCursorTo(position.row, position.column);
@@ -806,7 +823,7 @@ var Selection = function(session) {
     * @param {Number} column The column to move to
     * @param {Boolean} keepDesiredColumn [If `true`, the cursor move does not respect the previous column]{: #preventUpdateBool}
     *
-    * 
+    *
     **/
     this.moveCursorTo = function(row, column, keepDesiredColumn) {
         // Ensure the row/column is not inside of a fold.
@@ -830,7 +847,7 @@ var Selection = function(session) {
     * @param {Number} column The column to move to
     * @param {Boolean} keepDesiredColumn {:preventUpdateBool}
     *
-    * 
+    *
     **/
     this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
         var pos = this.session.screenToDocumentPosition(row, column);
@@ -842,12 +859,12 @@ var Selection = function(session) {
         this.lead.detach();
         this.anchor.detach();
         this.session = this.doc = null;
-    }
+    };
 
     this.fromOrientedRange = function(range) {
         this.setSelectionRange(range, range.cursor == range.start);
         this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
-    }
+    };
 
     this.toOrientedRange = function(range) {
         var r = this.getRange();
@@ -863,7 +880,74 @@ var Selection = function(session) {
         range.cursor = this.isBackwards() ? range.start : range.end;
         range.desiredColumn = this.$desiredColumn;
         return range;
-    }
+    };
+
+    /**
+    * Saves the current cursor position and calls `func` that can change the cursor
+    * postion. The result is the range of the starting and eventual cursor position.
+    * Will reset the cursor position.
+    * @param {Function} The callback that should change the cursor position
+    * @returns {Range}
+    *
+    **/
+    this.getRangeOfMovements = function(func) {
+        var start = this.getCursor();
+        try {
+            func.call(null, this);
+            var end = this.getCursor();
+            return Range.fromPoints(start,end);
+        } catch(e) {
+            return Range.fromPoints(start,start);
+        } finally {
+            this.moveCursorToPosition(start);
+        }
+    };
+
+    this.toJSON = function() {
+        if (this.rangeCount) {
+            var data = this.ranges.map(function(r) {
+                var r1 = r.clone();
+                r1.isBackwards = r.cursor == r.start;
+                return r1;
+            });
+        } else {
+            var data = this.getRange();
+            data.isBackwards = this.isBackwards();
+        }
+        return data;
+    };
+
+    this.fromJSON = function(data) {
+        if (data.start == undefined) {
+            if (this.rangeList) {
+                this.toSingleRange(data[0]);
+                for (var i = data.length; i--; ) {
+                    var r = Range.fromPoints(data[i].start, data[i].end);
+                    if (data.isBackwards)
+                        r.cursor = r.start;
+                    this.addRange(r, true);
+                }
+                return;
+            } else
+                data = data[0];
+        }
+        if (this.rangeList)
+            this.toSingleRange(data);
+        this.setSelectionRange(data, data.isBackwards);
+    };
+
+    this.isEqual = function(data) {
+        if ((data.length || this.rangeCount) && data.length != this.rangeCount)
+            return false;
+        if (!data.length || !this.ranges)
+            return this.getRange().isEqual(data);
+
+        for (var i = this.ranges.length; i--; ) {
+            if (!this.ranges[i].isEqual(data[i]))
+                return false;
+        }
+        return true;
+    };
 
 }).call(Selection.prototype);