WIP

nengo · Jul 14, 2016 · a56bf72 · a56bf72
1 parent 27090b8
commit a56bf72
Show file tree

Hide file tree

Showing 35 changed files with 301 additions and 6,436 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,6 @@ target/
 # Vagrant
 .vagrant
 Vagrantfile
+
+# Node JS stuff
+node_modules
diff --git a/nengo_gui/static/ace.js b/nengo_gui/static/ace.js
@@ -17,7 +17,7 @@ Nengo.disable_editor = function() {
 }
 
 Nengo.Ace = function (uid, args) {
-    this.AceRange = ace.require('ace/range').Range;
+    this.AceRange = ace.Range;
     if (uid[0] === '<') {
         console.log("invalid uid for Ace: " + uid);
     }

diff --git a/nengo_gui/static/components/netgraph.js b/nengo_gui/static/components/netgraph.js
@@ -144,10 +144,7 @@ Nengo.NetGraph = function(parent, args) {
      *  this is needed for saving the SVG plot to disk*/
 
     /** load contents of the CSS file as string */
-    var file = document.getElementById('netgraphcss');
-    var css = Array.prototype.map.call(file.sheet.cssRules, function
-            css_text(x) {return x.cssText; } ).join('\n');
-
+    var css = require('css-to-string-loader!./netgraph.css');
     /** embed CSS code into SVG tag */
     var s = document.createElement('style');
     s.setAttribute('type', 'text/css');

diff --git a/nengo_gui/static/data_to_csv.js b/nengo_gui/static/data_to_csv.js
@@ -66,3 +66,5 @@ var data_to_csv = function(data_set){
   return csv_string;
 
 }
+
+module.exports = data_to_csv;
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → ...st/448c34a56d699c29117adc64c43affeb.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → ...st/448c34a56d699c29117adc64c43affeb.woff2
diff --git a/...ib/fonts/glyphicons-halflings-regular.svg → ...dist/89889688147bd7575d6327160d64e760.svg b/...ib/fonts/glyphicons-halflings-regular.svg → ...dist/89889688147bd7575d6327160d64e760.svg
diff --git a/...ib/fonts/glyphicons-halflings-regular.ttf → ...dist/e18bbf611f2a2e43afc071aa2f4e1512.ttf b/...ib/fonts/glyphicons-halflings-regular.ttf → ...dist/e18bbf611f2a2e43afc071aa2f4e1512.ttf
diff --git a/...ib/fonts/glyphicons-halflings-regular.eot → ...dist/f4769f9bdb7466be65088239c12046d1.eot b/...ib/fonts/glyphicons-halflings-regular.eot → ...dist/f4769f9bdb7466be65088239c12046d1.eot
diff --git a/...b/fonts/glyphicons-halflings-regular.woff → ...ist/fa2772327f55d8198301fdb8bcfc8158.woff b/...b/fonts/glyphicons-halflings-regular.woff → ...ist/fa2772327f55d8198301fdb8bcfc8158.woff
diff --git a/nengo_gui/static/dist/favicon.ico b/nengo_gui/static/dist/favicon.ico
diff --git a/nengo_gui/static/dist/nengo.js b/nengo_gui/static/dist/nengo.js
diff --git a/nengo_gui/static/jquery.js b/nengo_gui/static/jquery.js
@@ -0,0 +1,16 @@
+/**
+ * Loads jQuery and all of the plugins we use.
+ *
+ * Since jQuery plugins work by modifying the global variable $,
+ * we load up all of the plugins we use here so that we don't load
+ * plugins multiple times.
+ */
+
+var jQuery = require('jquery');
+
+require('imports?$=jquery,jQuery=jquery!bootstrap');
+require('imports?$=jquery,jQuery=jquery!bootstrap-validator');
+require('imports?$=jquery,jQuery=jquery!jqueryfiletree/src/jQueryFileTree');
+require('imports?$=jquery,jQuery=jquery!jquery-ui');
+
+module.exports = jQuery;
diff --git a/nengo_gui/static/lib/css/bootstrap.min.css b/nengo_gui/static/lib/css/bootstrap.min.css
diff --git a/nengo_gui/static/lib/js/ace-src-min/ace.js b/nengo_gui/static/lib/js/ace-src-min/ace.js
diff --git a/nengo_gui/static/lib/js/ace-src-min/ext-searchbox.js b/nengo_gui/static/lib/js/ace-src-min/ext-searchbox.js
diff --git a/nengo_gui/static/lib/js/ace-src-min/mode-python.js b/nengo_gui/static/lib/js/ace-src-min/mode-python.js
diff --git a/nengo_gui/static/lib/js/bootstrap.min.js b/nengo_gui/static/lib/js/bootstrap.min.js
diff --git a/nengo_gui/static/lib/js/d3.v3.min.js b/nengo_gui/static/lib/js/d3.v3.min.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -66,3 +66,5 @@ var data_to_csv = function(data_set){
		return csv_string;

		}

		module.exports = data_to_csv;