Merge pull request #507 from openworm/development

More fixes for production
openworm · Oct 27, 2016 · 6a97b57 · 6a97b57
2 parents e5d918f + 5fd79cc
commit 6a97b57
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/src/main/webapp/build.js b/src/main/webapp/build.js
@@ -2,7 +2,7 @@
     preserveLicenseComments: false,
     paths: {
     	jquery :'vendor/jquery-1.9.1.min',
-    	three: 'vendor/threeWrapper',
+    	three: 'vendor/three.min',
 		d3 : 'vendor/d3.min',
 		codemirror :"vendor/codemirror.min",
 		underscore : 'vendor/underscore.min',
@@ -62,6 +62,7 @@
             exports: 'Bloodhound'
         }
     },
+    wrapShim: true,
     name : "main",
     waitSeconds : 200,
-})
+})
diff --git a/src/main/webapp/extensions/extensions.js b/src/main/webapp/extensions/extensions.js
@@ -1,4 +1,4 @@
-require(['json!../extensions/extensionsConfiguration.json', 'geppetto'], function(extensionConfiguration, GEPPETTO) {
+require(['json!../extensions/extensionsConfiguration.json', 'geppetto','components/ComponentFactory'], function(extensionConfiguration, GEPPETTO) {
 
 	//Require your extension in extensionConfiguration.json
 	for (var extension in extensionConfiguration){
@@ -8,4 +8,4 @@ require(['json!../extensions/extensionsConfiguration.json', 'geppetto'], functio
 			});
 		}
 	}
-});
+});
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
@@ -51,7 +51,7 @@ require.config({
      */
     paths: {
         jquery: "vendor/jquery-1.9.1.min",
-        three: 'vendor/threeWrapper',
+        three: 'vendor/three.min',
         d3: 'vendor/d3.min',
         codemirror: "vendor/codemirror.min",
         handlebars: "vendor/handlebars",

diff --git a/src/main/webapp/js/vendor/Detector.js b/src/main/webapp/js/vendor/Detector.js
@@ -57,3 +57,5 @@ var Detector = {
 	}
 
 };
+
+window.Detector=Detector;
diff --git a/src/main/webapp/js/vendor/THREEx.KeyboardState.js b/src/main/webapp/js/vendor/THREEx.KeyboardState.js
@@ -27,7 +27,7 @@
 
 /** @namespace */
 var THREEx	= THREEx 		|| {};
-
+window.THREEx=THREEx;
 /**
  * - NOTE: it would be quite easy to push event-driven too
  *   - microevent.js for events handling

diff --git a/src/main/webapp/js/vendor/three.min.js b/src/main/webapp/js/vendor/three.min.js
diff --git a/src/main/webapp/templates/geppetto.vm b/src/main/webapp/templates/geppetto.vm
@@ -61,7 +61,7 @@
 <div id="modal-region"></div>
 <div id="load-spinner"></div>
 
-<div id="controls">
+<div id="controls class="noSelection"">
 
 	<div id="SaveButton" class="row"></div>
 	<div id="HomeButton" class="row"></div>
@@ -79,23 +79,25 @@
 </div>
 
 <div id="mainContainer">
-    <div id="geppettologo" ></div>
-    <div id="spotlight" ></div>
-    <div id="controlpanel" ></div>
-    <div id="querybuilder" ></div>
-    <div id="sim"></div>
+    <div id="geppettologo" class="noSelection" ></div>
+    <div id="spotlight" class="hiddenStart" ></div>
+    <div id="controlpanel"  class="hiddenStart" ></div>
+    <div id="querybuilder"  class="hiddenStart" ></div>
+    <div id="sim" class="noSelection"></div>
 
     <div id="footer">
         <div id="footerHeader">
             <div id="consoleButtonContainer">
 	            <ul class="btn nav nav-tabs" role="tablist" id="tabButton">
     				<li role="presentation" class="active" id="consoleButton"><a href="#console" aria-controls="console" role="tab" data-toggle="tab"><i class="fa fa-terminal"></i>  Console</a></li>
-    				<li role="presentation" id="experimentsButton"><a href="#experiments" aria-controls="experiments" role="tab" data-toggle="tab"><i class="fa fa-flask"></i>  Experiments</a></li>
+    				<li role="presentation" id="experimentsButton" style="display:none"><a href="#experiments" aria-controls="experiments" role="tab" data-toggle="tab"><i class="fa fa-flask"></i>  Experiments</a></li>
+					<li role="presentation" id="pythonConsoleButton" style="display:none"><a href="#pythonConsole" aria-controls="pythonConsole" role="tab" data-toggle="tab"><i class="fa fa-terminal"></i>  Python</a></li>
 				</ul>
 
 				 <div class="tab-content">
     					<div role="tabpanel" class="tab-pane active" id="console">Console Loading...</div>
     					<div role="tabpanel" id="experiments" class="tab-pane panel panel-default"></div>
+                        <div role="tabpanel" id="pythonConsole" class="tab-pane  panel panel-default"></div>
  				 </div>
             </div>
 
@@ -151,7 +153,6 @@
     ga('send', 'pageview');
 </script>
 
-<noscript><a href="https://www.olark.com/site/3330-945-10-6280/contact" title="Contact us" id="contact" target="_blank">Questions? Feedback?</a> powered by <a href="http://www.olark.com?welcome" title="Olark live chat software">Olark live chat software</a></noscript>
-<!-- end olark code -->
+
 </body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,3 +57,5 @@ var Detector = {
		}

		};

		window.Detector=Detector;