[codeeditor] fix state and prepare shortcuts

vispa/extensions/codeeditor/static/js/commandline.js

@@ -30,7 +30,7 @@ define(["jquery", "emitter", "vispa/extension"], function($, Emitter, Extension)
       this.cookieName = null;
       this.commandCookie = null;
 
-      this.view.on("stateChange", function(key) {
+      this.view.on("changedState", function(key) {
         if (!self.commandline)
           return;
         switch (key) {

vispa/extensions/codeeditor/static/js/editor.js

@@ -36,7 +36,7 @@ define([
 
       this.actions = new CodeEditorActions(this, view);
 
-      this.view.on("stateChange", function(key) {
+      this.view.on("changedState", function(key) {
         if (key == "path") {
           if (!self.ace) return;
           var path = self.view.state.get("path");
@@ -91,7 +91,7 @@ define([
       self.applyShortcuts();
 
       // trigger loading of state again since we can handle it now
-      self.view.emit("stateChange", "path");
+      self.view.emit("changedState", "path");
       self.ace.focus();
       self.ace.resize();
       self.view.setLoading(false);
@@ -239,8 +239,8 @@ define([
       }.bind(this));
 
       // overwrite with custom commands
-      var shortcuts = $.extend(true, {}, this.view._shortcuts);
-      var shortcutData = $.extend(true, {}, this.view._extension._defaultShortcuts.CodeEditor);
+      var shortcuts = $.extend(true, {}, this.view.shortcuts.children());
+      var shortcutData = $.extend(true, {}, Prefs.shortcuts);
 
       //entries with incorrect syntax due to key even indication
       var notAllowed = [];

vispa/extensions/codeeditor/static/js/preview.js

@@ -27,7 +27,7 @@ define(["jquery", "emitter", "text!../html/preview.html"], function($, Emitter,
       this.thumbnailSize = null;
 
 
-      this.view.on("stateChange", function(key) {
+      this.view.on("changedState", function(key) {
         switch (key) {
           case "path":
             var path = self.view.state.get("path");
@@ -105,7 +105,7 @@ define(["jquery", "emitter", "text!../html/preview.html"], function($, Emitter,
       self.loaderInterval = setInterval(function() {
         self.refresh();
       }, 1000);
-      self.view.emit("stateChange", "previewPath");
+      self.view.emit("changedState", "previewPath");
 
       return this;
     },

vispa/extensions/codeeditor/static/js/ui.js

@@ -83,7 +83,7 @@ define(["jquery", "emitter"], function($, Emitter) {
         }
       });
 
-      this.view.on("stateChange", function(key) {
+      this.view.on("changedState", function(key) {
         if (key == "showOutput") {
           self.setInputOutputRatio();
         }

vispa/extensions/codeeditor/static/js/view.js

@@ -112,7 +112,7 @@ define([
       this.commandLine.setup(node);
 
       this.applyPreferences();
-      this._applyShortcuts();
+      // this._applyShortcuts();
       //initially set the icon
       this.icon = "fa-align-left";
       this.setLoading(false);