lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/commands/command_manager_test.js in gollum-2.4.4 vs lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/commands/command_manager_test.js in gollum-2.4.5
- old
+ new
@@ -1,40 +1,33 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
*
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * 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
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * 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
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
* ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") {
require("amd-loader");
}
@@ -66,44 +59,44 @@
this.cm.exec("gotoline");
assert.ok(this.command.called);
},
"test: mac hotkeys": function() {
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
assert.equal(command, this.command);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "L");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "l");
assert.equal(command, undefined);
},
"test: win hotkeys": function() {
var cm = new CommandManager("win", [this.command]);
- var command = cm.findKeyCommand(keys.KEY_MODS.command, "L");
+ var command = cm.findKeyCommand(keys.KEY_MODS.command, "l");
assert.equal(command, undefined);
- var command = cm.findKeyCommand(keys.KEY_MODS.ctrl, "L");
+ var command = cm.findKeyCommand(keys.KEY_MODS.ctrl, "l");
assert.equal(command, this.command);
},
"test: remove command by object": function() {
this.cm.removeCommand(this.command);
this.cm.exec("gotoline");
assert.ok(!this.command.called);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
assert.equal(command, null);
},
"test: remove command by name": function() {
this.cm.removeCommand("gotoline");
this.cm.exec("gotoline");
assert.ok(!this.command.called);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
assert.equal(command, null);
},
"test: adding a new command with the same name as an existing one should remove the old one first": function() {
var command = {
@@ -119,18 +112,18 @@
this.cm.exec("gotoline");
assert.ok(command.called);
assert.ok(!this.command.called);
- assert.equal(this.cm.findKeyCommand(keys.KEY_MODS.command, "L"), command);
+ assert.equal(this.cm.findKeyCommand(keys.KEY_MODS.command, "l"), command);
},
"test: adding commands and recording a macro": function() {
var called = "";
this.cm.addCommands({
togglerecording: function(editor) {
- editor.cm.toggleRecording();
+ editor.cm.toggleRecording(editor);
},
replay: function(editor) {
editor.cm.replay();
},
cm1: function(editor, arg) {
@@ -138,13 +131,18 @@
},
cm2: function(editor) {
called += "2";
}
});
+
+
+ var statusUpdateEmitted = false;
+ this._emit = function() {statusUpdateEmitted = true};
this.cm.exec("togglerecording", this);
assert.ok(this.cm.recording);
+ assert.ok(statusUpdateEmitted);
this.cm.exec("cm1", this, "-");
this.cm.exec("cm2");
this.cm.exec("replay", this);
assert.ok(!this.cm.recording);
@@ -154,36 +152,44 @@
this.cm.exec("replay", this);
assert.equal(called, "1-2");
},
"test: bindkeys": function() {
- var called = "";
- this.cm.addCommands({
- cm1: function(editor, arg) {
- called += "1" + (arg || "");
- },
- cm2: function(editor) {
- called += "2";
- }
- });
-
this.cm.bindKeys({
"Ctrl-L|Command-C": "cm1",
"Ctrl-R": "cm2"
});
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "C");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "c");
assert.equal(command, "cm1");
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "R");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "r");
assert.equal(command, "cm2");
this.cm.bindKeys({
"Ctrl-R": null
});
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "R");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "r");
assert.equal(command, null);
+ },
+
+ "test: binding keys without modifiers": function() {
+ this.cm.bindKeys({
+ "R": "cm1",
+ "Shift-r": "cm2",
+ "Return": "cm4",
+ "Enter": "cm3"
+ });
+
+ var command = this.cm.findKeyCommand(-1, "r");
+ assert.equal(command, "cm1");
+
+ var command = this.cm.findKeyCommand(-1, "R");
+ assert.equal(command, "cm2");
+
+ var command = this.cm.findKeyCommand(0, "return");
+ assert.equal(command, "cm3");
}
};
});