From c31834c6785f91c096b3885ddc415aa0125dcdba Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Wed, 25 Apr 2012 13:02:43 -0700 Subject: [PATCH] More updates --- .../ace/skeleton/images/ace_logo_menu.png | Bin 0 -> 3252 bytes .../ace/skeleton/images/dashed_back.png | Bin 0 -> 3445 bytes doc/resources/ace/templates/ace_menu.jade | 17 +++----- lib/ace/multi_select.js | 40 +++++++++--------- lib/ace/range.js | 2 +- 5 files changed, 27 insertions(+), 32 deletions(-) create mode 100644 doc/resources/ace/skeleton/images/ace_logo_menu.png create mode 100644 doc/resources/ace/skeleton/images/dashed_back.png diff --git a/doc/resources/ace/skeleton/images/ace_logo_menu.png b/doc/resources/ace/skeleton/images/ace_logo_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..b011fadddde67e168c1c8ff0468f01f03321b634 GIT binary patch literal 3252 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 XM~`vmQcs7_00000NkvXXu0mjfem-^= literal 0 HcmV?d00001 diff --git a/doc/resources/ace/templates/ace_menu.jade b/doc/resources/ace/templates/ace_menu.jade index 11f67742..d5da33e1 100755 --- a/doc/resources/ace/templates/ace_menu.jade +++ b/doc/resources/ace/templates/ace_menu.jade @@ -21,19 +21,16 @@ div#well li div.menu-item a(class="menuLink namespace", href="editor.html") Editor - li - div.menu-item - a(class="menuLink namespace", href="multi_select.html") MultiSelect - li - div.menu-item - a(class="menuLink namespace", href="placeholder.html") PlaceHolder + //- probably not needing doc a(class="menuLink namespace", href="multi_select.html") MultiSelect + + //- not actually doc'ed yet a(class="menuLink namespace", href="placeholder.html") PlaceHolder + li div.menu-item a(class="menuLink namespace", href="range.html") Range - //- not actually doc'ed yet - li - div.menu-item - a(class="menuLink namespace", href="renderloop.html") RenderLoop + //- not actually doc'ed yet a(class="menuLink namespace", href="renderloop.html") RenderLoop + + li div.menu-item a(class="menuLink namespace", href="scrollbar.html") Scrollbar diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js index 51641618..11db7d95 100644 --- a/lib/ace/multi_select.js +++ b/lib/ace/multi_select.js @@ -71,7 +71,7 @@ var EditSession = require("./edit_session").EditSession; // automatically sorted list of ranges this.rangeList = null; - /** + /** extension * Selection.addRange(range, $blockChangeEvents) * - range (Range): The new range to add * - $blockChangeEvents (Boolean): Whether or not to block changing events @@ -120,7 +120,7 @@ var EditSession = require("./edit_session").EditSession; range && this.fromOrientedRange(range); }; - /** + /** extension * Selection.substractPoint(pos) -> Range * - pos (Range): The position to remove, as a `{row, column}` object * @@ -134,7 +134,7 @@ var EditSession = require("./edit_session").EditSession; } }; - /** + /** extension * Selection.mergeOverlappingRanges() * * Merges overlapping ranges ensuring consistency after changes @@ -211,7 +211,7 @@ var EditSession = require("./edit_session").EditSession; } }; - /** + /** extension * Selection.rectangularRangeBlock(screenCursor, screenAnchor, includeEmptyLines) -> Range * - screenCursor (Cursor): The cursor to use * - screenAnchor (Anchor): The anchor to use @@ -288,17 +288,18 @@ var EditSession = require("./edit_session").EditSession; // extend Editor var Editor = require("./editor").Editor; (function() { - /** + + /** extension * Editor.updateSelectionMarkers() * - * updates cursor and marker layers + * Updates the cursor and marker layers. **/ this.updateSelectionMarkers = function() { this.renderer.updateCursor(); this.renderer.updateBackMarkers(); }; - /** + /** extension * Editor.addSelectionMarker(orientedRange) -> Range * - orientedRange (Range): A range containing a cursor * @@ -316,7 +317,7 @@ var Editor = require("./editor").Editor; return orientedRange; }; - /** + /** extension * Editor.removeSelectionMarker(range) * - range (Range): The selection range added with [[Editor.addSelectionMarker `addSelectionMarker()`]]. * @@ -402,7 +403,7 @@ var Editor = require("./editor").Editor; e.preventDefault(); }; - /** + /** extension * Editor.forEachSelection(cmd, args) * - cmd (String): The command to execute * - args (String): Any arguments for the command @@ -439,10 +440,10 @@ var Editor = require("./editor").Editor; this.onSelectionChange(); }; - /** + /** extension * Editor.exitMultiSelectMode() * - * removes all selections except the last added one. + * Removes all the selections except the last added one. **/ this.exitMultiSelectMode = function() { if (this.inVirtualSelectionMode) @@ -466,7 +467,7 @@ var Editor = require("./editor").Editor; return text; }; - /** + /** extension * Editor.findAll(needle, dir, additive) -> Number * - needle (String): The text to find * - options (Object): Any of the additional [[Search search options]] @@ -500,7 +501,7 @@ var Editor = require("./editor").Editor; }; // commands - /** + /** extension * Editor.selectMoreLines(dir, skip) * - dir (Number): The direction of lines to select: -1 for up, 1 for down * - skip (Boolean): If `true`, removes the active selection range @@ -545,7 +546,7 @@ var Editor = require("./editor").Editor; this.selection.substractPoint(toRemove); }; - /** + /** extension * Editor.transposeSelections(dir) * - dir (Number): The direction to rotate selections * @@ -589,7 +590,7 @@ var Editor = require("./editor").Editor; } } - /** + /** extension * Editor.selectMore(dir, skip) * - dir (Number): The direction of lines to select: -1 for up, 1 for down * - skip (Boolean): If `true`, removes the active selection range @@ -661,12 +662,9 @@ exports.onSessionChange = function(e) { } }; -/** - * MultiSelect(editor) - * - * adds multiple selection support to the editor - * (note: should be called only once for each editor instance) - **/ +// MultiSelect(editor) +// adds multiple selection support to the editor +// (note: should be called only once for each editor instance) function MultiSelect(editor) { editor.$onAddRange = editor.$onAddRange.bind(editor); editor.$onRemoveRange = editor.$onRemoveRange.bind(editor); diff --git a/lib/ace/range.js b/lib/ace/range.js index 34c2ffc7..e09b850d 100644 --- a/lib/ace/range.js +++ b/lib/ace/range.js @@ -567,7 +567,7 @@ var Range = function(startRow, startColumn, endRow, endColumn) { }).call(Range.prototype); /** - * Range#fromPoints(start, end) -> Range + * Range.fromPoints(start, end) -> Range * - start (Range): A starting point to use * - end (Range): An ending point to use *