diff --git a/css/main.css b/css/main.css index 4cff0d83bb7eb0adf90c1610a69b70d0ba95fe61..a48f6095f614a88e3cd0db6091af91acf073c1be 100644 --- a/css/main.css +++ b/css/main.css @@ -105,7 +105,7 @@ nav .btn { #menuWrapper, #scriptView { height: 100%; - z-index: 1; + z-index: 2; position: absolute; display: block; background-color: rgba(255,255,255,0.8); diff --git a/dependencies/codemirror/javascript.js b/dependencies/codemirror/javascript.js index bee88997be772273e6fd5de865e16c4c21c1285c..136ed714205d524288835f9b6145ff9cf1e190f1 100755 --- a/dependencies/codemirror/javascript.js +++ b/dependencies/codemirror/javascript.js @@ -5,9 +5,9 @@ (function(mod) { if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); + mod(require("codeMirror")); else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); + define(["codeMirror"], mod); else // Plain browser env mod(CodeMirror); })(function(CodeMirror) { diff --git a/js/main.js b/js/main.js index 2f3c128f7cccb977f0ec05cf27c4cf14243cfbf3..a16988a839c1d5fcbc3722e542c46957d94a26af 100644 --- a/js/main.js +++ b/js/main.js @@ -234,10 +234,6 @@ require.config({ }, 'numeric': { exports: 'numeric' - }, - 'codeMirror': { - deps: ['codeMirrorJS'], - exports: 'CodeMirror' } } @@ -250,7 +246,7 @@ require.config({ //}; //init stuff -require(['appState', 'lattice', 'navbar', 'threeModel', 'threeView', 'flatUI', 'bootstrapSlider', 'ribbon', 'menuWrapper'], +require(['appState', 'lattice', 'navbar', 'threeModel', 'threeView', 'flatUI', 'bootstrapSlider', 'ribbon', 'menuWrapper', 'scriptView'], function(appState, lattice, Navbar, three, ThreeView){ new Navbar({model:appState}); diff --git a/js/menus/ScriptView.js b/js/menus/ScriptView.js index 300b447deb52d95c17eb33a410b166bc939553f0..f491967e515a72090d1db91f2e9f9ae03a4e8763 100644 --- a/js/menus/ScriptView.js +++ b/js/menus/ScriptView.js @@ -4,7 +4,8 @@ -define(['jquery', 'underscore', 'backbone', 'appState', 'codeMirror'], function($, _, Backbone, appState, CodeMirror){ +define(['jquery', 'underscore', 'backbone', 'appState', 'codeMirror', 'text!menus/templates/ScriptView.html', 'codeMirrorJS'], + function($, _, Backbone, appState, CodeMirror, template){ var ScriptView = Backbone.View.extend({ @@ -19,7 +20,7 @@ define(['jquery', 'underscore', 'backbone', 'appState', 'codeMirror'], function( initialize: function(){ - _.bindAll(this, "render", "_handleKeyStroke"); + _.bindAll(this, "render"); //bind events // $(document).bind('keydown', {}, this._handleKeyStroke); @@ -83,12 +84,7 @@ define(['jquery', 'underscore', 'backbone', 'appState', 'codeMirror'], function( this._setEditorHeight(); }, - template: _.template('\ - <div class="col-sm-4"><a href="#" id="loadScript" class=" btn btn-lg btn-block btn-default">Load Script</a></div>\ - <div class="col-sm-4"><a href="#" id="runScript" class=" btn btn-lg btn-block btn-default">Run Script   (CTRL/⌘ + R)</a></div>\ - <div class="col-sm-4"><a href="#" id="saveScript" class=" btn btn-lg btn-block btn-default">Save Script</a></div><br/><br/>\ - <textarea id="scriptEditor"><%= script %></textarea><br/>\ - ') + template: _.template(template) }); diff --git a/js/menus/templates/ScriptView.html b/js/menus/templates/ScriptView.html new file mode 100644 index 0000000000000000000000000000000000000000..d1cc3247a9315234311c0c44bc5d48b463ca24a9 --- /dev/null +++ b/js/menus/templates/ScriptView.html @@ -0,0 +1,5 @@ +<!--<div class="col-sm-4"><a href="#" id="loadScript" class=" btn btn-lg btn-block btn-default">Load Script</a></div>--> +<!--<div class="col-sm-4"><a href="#" id="runScript" class=" btn btn-lg btn-block btn-default">Run Script   (CTRL/⌘ + R)</a></div>--> +Script Name<a href="#" id="saveScript" class=" btn btn-lg btn-default pull-right">Save Script</a><br/><br/> +<!--<br/><br/>--> +<textarea id="scriptEditor"><%= script %></textarea><br/> \ No newline at end of file