jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #1143, #1144, #1145

Browse source
This commit is contained in:
Garen Torikian 2012-12-26 00:58:20 -08:00 • committed by nightwing
commit 4d474bcdaf
4 changed files with 50 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

30
api/editor.html
View file

@ -1652,10 +1652,10 @@
</ul>
</div>
<div class="sideToggler">
<div id="ellipsis_Editor.getScrollSpeed" class="ellipsis_description"><p>Returns the value indicating how fast the mouse scroll speed is.</p>
<div id="ellipsis_Editor.getScrollSpeed" class="ellipsis_description"><p>Returns the value indicating how fast the mouse scroll speed is (in milliseconds).</p>
</div>
<div class="description"><p>Returns the value indicating how fast the mouse scroll speed is.</p>
<div class="description"><p>Returns the value indicating how fast the mouse scroll speed is (in milliseconds).</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"></table>
</div>
@ -4179,7 +4179,7 @@
</div>
<div class="description"><p>Sets how fast the mouse scrolling should do.</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">speed</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription "><p>Required. A value indicating the new speed</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">speed</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Number.html" class="" title="Number" data-id="Number">Number</a></td><td class="argDescription "><p>Required. A value indicating the new speed (in milliseconds)</p>
</td></tr></table>
</div>
</div>
@ -4205,7 +4205,9 @@
</div>
<div class="description"><p>Indicates how selections should occur. </p>
<p>By default, selections are set to &quot;line&quot;. This function also emits the <code>&#39;changeSelectionStyle&#39;</code> event.</p>
<p>By default, selections are set to &quot;line&quot;. There are no other styles at the moment,
although this code change in the future.</p>
<p>This function also emits the <code>&#39;changeSelectionStyle&#39;</code> event.</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">style</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/String.html" class="" title="String" data-id="String">String</a></td><td class="argDescription "><p>Required. The new selection style</p>
</td></tr></table>
@ -4416,7 +4418,7 @@
<ul class="signatures">
<li class="signature">
<ul>
<li class="signature-call"><span id="Editor.setWrapBehavioursEnabled" class="member-name methodClicker"><span class="sigClassName">Editor.</span><span class="sigMemberName">setWrapBehavioursEnabled</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Object.html" class="argument methodClicker" title="Object" data-id="Object">Object</a> enabled</span>)</li>
<li class="signature-call"><span id="Editor.setWrapBehavioursEnabled" class="member-name methodClicker"><span class="sigClassName">Editor.</span><span class="sigMemberName">setWrapBehavioursEnabled</span></span>(<span class="sigArgList"><a href="http://www.nodemanual.org/latest/js_doc/Boolean.html" class="argument methodClicker" title="Boolean" data-id="Boolean">Boolean</a> enabled</span>)</li>
</ul>
<ul class="metaInfo">
</ul>
@ -4424,20 +4426,14 @@
</ul>
</div>
<div class="sideToggler">
<div id="ellipsis_Editor.setWrapBehavioursEnabled" class="ellipsis_description"><p>Editor.setWrapBehavioursEnabled(enabled) </p>
<ul>
<li>enabled (Boolean): Enables or disables wrapping behaviors</li>
</ul>
</div>
<div class="description"><p>Editor.setWrapBehavioursEnabled(enabled) </p>
<ul>
<li>enabled (Boolean): Enables or disables wrapping behaviors</li>
</ul>
<p>Specifies whether to use wrapping behaviors or not, i.e. automatically wrapping the selection with characters such as brackets
<div id="ellipsis_Editor.setWrapBehavioursEnabled" class="ellipsis_description"><p>Specifies whether to use wrapping behaviors or not, i.e. automatically wrapping the selection with characters such as brackets
when such a character is typed in.</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">enabled</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Object.html" class="" title="Object" data-id="Object">Object</a></td><td class="argDescription "><p>Required. </p>
</div>
<div class="description"><p>Specifies whether to use wrapping behaviors or not, i.e. automatically wrapping the selection with characters such as brackets
when such a character is typed in.</p>
<h4>Arguments</h4><table class="argumentTable argument-list table table-striped table-bordered"><tr class="argumentRow "><td class="argName ">enabled</td><td class="argType" "><a href="http://www.nodemanual.org/latest/js_doc/Boolean.html" class="" title="Boolean" data-id="Boolean">Boolean</a></td><td class="argDescription "><p>Required. Enables or disables wrapping behaviors</p>
</td></tr></table>
</div>
</div>

28
api/virtual_renderer.html
View file

@ -17,7 +17,7 @@
</li>
</ul>
</li>
<li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (72)</span><b class="caret"></b></a>
<li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (73)</span><b class="caret"></b></a>
<ul class="dropdown-menu">
<li id="dropdown_VirtualRenderer._loadTheme" data-id="VirtualRenderer._loadTheme" class="memberLink"><a href="#VirtualRenderer._loadTheme" class="" title="VirtualRenderer._loadTheme (class method)" data-id="VirtualRenderer._loadTheme">_loadTheme</a>
</li>
@ -81,6 +81,8 @@
</li>
<li id="dropdown_VirtualRenderer.onChangeTabSize" data-id="VirtualRenderer.onChangeTabSize" class="memberLink"><a href="#VirtualRenderer.onChangeTabSize" class="" title="VirtualRenderer.onChangeTabSize (class method)" data-id="VirtualRenderer.onChangeTabSize">onChangeTabSize</a>
</li>
<li id="dropdown_VirtualRenderer.onGutterResize" data-id="VirtualRenderer.onGutterResize" class="memberLink"><a href="#VirtualRenderer.onGutterResize" class="" title="VirtualRenderer.onGutterResize (class method)" data-id="VirtualRenderer.onGutterResize">onGutterResize</a>
</li>
<li id="dropdown_VirtualRenderer.onResize" data-id="VirtualRenderer.onResize" class="memberLink"><a href="#VirtualRenderer.onResize" class="" title="VirtualRenderer.onResize (class method)" data-id="VirtualRenderer.onResize">onResize</a>
</li>
<li id="dropdown_VirtualRenderer.pixelToScreenCoordinates" data-id="VirtualRenderer.pixelToScreenCoordinates" class="memberLink"><a href="#VirtualRenderer.pixelToScreenCoordinates" class="" title="VirtualRenderer.pixelToScreenCoordinates (class method)" data-id="VirtualRenderer.pixelToScreenCoordinates">pixelToScreenCoordinates</a>
@ -1110,6 +1112,30 @@
</div>
</div>
</article>
<article id="VirtualRenderer.onGutterResize" data-title="VirtualRenderer.onGutterResize (class method)" class="article">
<div class="section method">
<div class="memberContent">
<div class="title"><i id="VirtualRenderer.onGutterResize" class="methodToggle methodClicker inactive icon-caret-right"></i>
<ul class="signatures">
<li class="signature">
<ul>
<li class="signature-call"><span id="VirtualRenderer.onGutterResize" class="member-name methodClicker"><span class="sigClassName">VirtualRenderer.</span><span class="sigMemberName">onGutterResize</span></span></li>
</ul>
<ul class="metaInfo">
<li><span class="label undocumented">Undocumented</span></li>
</ul>
</li>
</ul>
</div>
<div class="sideToggler">
<div id="ellipsis_VirtualRenderer.onGutterResize" class="ellipsis_description">
</div>
<div class="description">
</div>
</div>
</div>
</div>
</article>
<article id="VirtualRenderer.onResize" data-title="VirtualRenderer.onResize (class method)" class="article">
<div class="section method">
<div class="memberContent">

18
lib/ace/editor.js
View file

@ -492,7 +492,7 @@ var Editor = function(renderer, session) {
if (session.$highlightLineMarker && !highlight) {
session.removeMarker(session.$highlightLineMarker.id);
session.$highlightLineMarker = null;
session.$highlightLineMarker = null;
} else if (!session.$highlightLineMarker && highlight) {
session.$highlightLineMarker = session.highlightLines(highlight.row, highlight.row, "ace_active-line");
} else if (highlight) {
@ -793,7 +793,7 @@ var Editor = function(renderer, session) {
/**
* Sets how fast the mouse scrolling should do.
* @param {Number} speed A value indicating the new speed
* @param {Number} speed A value indicating the new speed (in milliseconds)
*
*
*
@ -803,7 +803,7 @@ var Editor = function(renderer, session) {
};
/**
* Returns the value indicating how fast the mouse scroll speed is.
* Returns the value indicating how fast the mouse scroll speed is (in milliseconds).
* @returns {Number}
**/
this.getScrollSpeed = function() {
@ -842,7 +842,10 @@ var Editor = function(renderer, session) {
/**
* Indicates how selections should occur.
*
* By default, selections are set to "line". This function also emits the `'changeSelectionStyle'` event.
* By default, selections are set to "line". There are no other styles at the moment,
* although this code change in the future.
*
* This function also emits the `'changeSelectionStyle'` event.
*
* @param {String} style The new selection style
*
@ -870,8 +873,6 @@ var Editor = function(renderer, session) {
* Determines whether or not the current line should be highlighted.
* @param {Boolean} shouldHighlight Set to `true` to highlight the current line
*
*
*
**/
this.setHighlightActiveLine = function(shouldHighlight) {
if (this.$highlightActiveLine == shouldHighlight)
@ -1039,11 +1040,10 @@ var Editor = function(renderer, session) {
this.$modeWrapBehaviours = true;
/**
* Editor.setWrapBehavioursEnabled(enabled)
* - enabled (Boolean): Enables or disables wrapping behaviors
*
* Specifies whether to use wrapping behaviors or not, i.e. automatically wrapping the selection with characters such as brackets
* when such a character is typed in.
* @param {Boolean} enabled Enables or disables wrapping behaviors
*
**/
this.setWrapBehavioursEnabled = function (enabled) {
this.$modeWrapBehaviours = enabled;

1
lib/ace/selection.js
View file

@ -245,6 +245,7 @@ var Selection = function(session) {
*
*
* @method setSelectionRange
* @alias setRange
**/
this.setRange =
this.setSelectionRange = function(range, reverse) {