diff --git a/ChangeLog.txt b/ChangeLog.txt index cad1e517..36e46556 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,5 @@ + + 2014.11.08 Version 1.1.8 * API Changes diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 4f1c2739..1a3eed0a 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -150,9 +150,8 @@ var Editor = function(renderer, session) { args: commadEvent.args, scrollTop: this.renderer.scrollTop }; - if (this.curOp.command.name) + if (this.curOp.command.name && this.curOp.command.scrollIntoView !== undefined) this.$blockScrolling++; - // this.selections.push(this.selection.toJSON()); }; this.endOperation = function(e) { @@ -161,7 +160,7 @@ var Editor = function(renderer, session) { return this.curOp = null; this._signal("beforeEndOperation"); var command = this.curOp.command; - if (command.name && this.$blockScrolling) + if (command.name && this.$blockScrolling > 0) this.$blockScrolling--; if (command && command.scrollIntoView) { switch (command.scrollIntoView) { diff --git a/tool/release.sh b/tool/release.sh index 6dc830e1..52376914 100644 --- a/tool/release.sh +++ b/tool/release.sh @@ -9,11 +9,16 @@ pause() { done } -read -p "enter version number for the build " VERSION_NUM + cd `dirname $0`/.. SOURCE=`pwd` +CUR_VERSION=`node -e 'console.log(require("./package.json").version)'` +git --no-pager log --first-parent --oneline v$CUR_VERSION..master +echo "current version is $CUR_VERSION" +read -p "enter version number for the build " VERSION_NUM + node -e " var fs = require('fs'); var version = '$VERSION_NUM';