added option to create both debug and release version of vm scripts. …

…release version uses the minified javascripts which is much faster in the browser
rherrick · May 1, 2015 · 67fd530 · 67fd530
1 parent 4c7a651
commit 67fd530
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 121 deletions.
diff --git a/src/main/scripts/viewer/xiv/popup.html → src/main/scripts/viewer/xiv/debug/popup.html b/src/main/scripts/viewer/xiv/popup.html → src/main/scripts/viewer/xiv/debug/popup.html
@@ -4,7 +4,7 @@
 
 
 
-<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.pyc at 2014-09-24 19:47:51 -->
+<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.py at 2015-05-01 12:17:24 -->
 
 
 
@@ -14,7 +14,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-
+<link type="text/css" rel="stylesheet" href="Demo.css">
 <link type="text/css" rel="stylesheet" href="../../../scripts/viewer/nrg/css/nrg.css">
 <link type="text/css" rel="stylesheet" href="../../../scripts/viewer/xiv/css/xiv.css">
 

diff --git a/src/main/scripts/viewer/xiv/popup.BKP → ...ain/scripts/viewer/xiv/release/popup.html b/src/main/scripts/viewer/xiv/popup.BKP → ...ain/scripts/viewer/xiv/release/popup.html
@@ -4,7 +4,7 @@
 
 
 
-<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.pyc at 2014-09-24 19:47:25 -->
+<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.py at 2015-05-01 12:15:53 -->
 
 
 
@@ -14,34 +14,16 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-
+<link type="text/css" rel="stylesheet" href="Demo.css">
+<!-- BEGIN /xnat-templates/screens/XIViewer.vm -->
 <link type="text/css" rel="stylesheet" href="../../../scripts/viewer/nrg/css/nrg.css">
 <link type="text/css" rel="stylesheet" href="../../../scripts/viewer/xiv/css/xiv.css">
-
-<!--
-<link type="text/css" rel="stylesheet" href="../../../scripts/viewer/css/viewer.min.css">
--->
-<script src="../../../scripts/viewer/closure-library/closure/goog/base.js"></script>
-<script src="../../../scripts/viewer/X/xtk-deps.js"></script>
-<script src="../../../scripts/viewer/_custom/X/xtk-custom-deps.js"></script>
-<script src="../../../scripts/viewer/jszip/jszip.js"></script>
-<script src="../../../scripts/viewer/nrg/nrg-deps.js"></script>
-<script src="../../../scripts/viewer/gxnat/gxnat-deps.js"></script>
-<script src="../../../scripts/viewer/xiv/xiv-deps.js"></script>
 <script>
-goog.require('goog.userAgent');
-serverRoot = '';
-goog.require('goog.dom');
-serverRoot = '';
-goog.require('xiv.start');
-serverRoot = '';
-goog.require('xiv.ui.Modal');
-serverRoot = '';
-goog.require('xiv.utils.ErrorCatcher');
-serverRoot = '';
-goog.require('xiv.utils.ObjectAnalyzer');
-serverRoot = '';
+window.console.log('using xiv-min.js')
 </script>
+<script src="../../../scripts/viewer/jszip/jszip.min.js"></script>
+<script src="../../../scripts/viewer/xiv-min.js"></script>
+
 
 
 </head>
@@ -56,29 +38,6 @@
 XIV_STATE = 'live';
 
 
-function displayModalError() {
-var noMobileDiv = goog.dom.createDom('div',
-{'id': 'NoMobileDiv'});
-goog.dom.classes.add(noMobileDiv, 'xiv-ui-nomobilemodal');
-
-var noMobileContent = goog.dom.createDom('div',
-{'id': 'NoMobileContent'});
-goog.dom.classes.add(noMobileContent, 'xiv-ui-nomobilemodal-content');
-noMobileContent.innerHTML =
-'The XNATImageViewer is not yet <br> supported on mobile devices :(';
-
-goog.dom.append(document.body, noMobileDiv);
-goog.dom.append(noMobileDiv, noMobileContent);
-
-noMobileDiv.onClick = function(){
-if (XIV_STATE == 'demo'){
-goog.dom.removeNode(noMobileDiv);
-}
-}
-}
-
-
-
 /**
 * Main launch function for the XNAT Image Viewer.
 * NOTES:
@@ -98,21 +57,11 @@
 */
 function launchXImgView(opt_dataPath, opt_modalState, opt_serverRoot) {
 
-
-
 //window.console.log('xiv', xiv);
 //window.console.log('compat', xiv.isCompatible);
 //window.console.log('root', xiv.prototype.setServerRoot);
 //window.console.log('states', xiv.ui.Modal);
 
-//
-// Detect Mobile display dialog
-//
-if(goog.userAgent.MOBILE) {
-displayModalError()
-return;
-}
-
 //-------------------
 // We need to set the global serverRoot property if opt_serverRoot is
 // argument is given.
@@ -125,8 +74,6 @@
 }
 
 
-
-
 //-------------------
 // Verify compatibilities (browser, WebGL, etc.)
 //-------------------

diff --git a/src/main/templates/screens/XImgView.vm → src/main/templates/screens/debug/XImgView.vm b/src/main/templates/screens/XImgView.vm → src/main/templates/screens/debug/XImgView.vm
@@ -4,7 +4,7 @@
 
 
 
-<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.pyc at 2014-09-24 19:47:51 -->
+<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.py at 2015-05-01 12:17:24 -->
 
 
 
@@ -17,7 +17,7 @@
 
 
 
-
+<link type="text/css" rel="stylesheet" href="$content.getURI("Demo.css")">
 <link type="text/css" rel="stylesheet" href="$content.getURI("scripts/viewer/nrg/css/nrg.css")">
 <link type="text/css" rel="stylesheet" href="$content.getURI("scripts/viewer/xiv/css/xiv.css")">
 

diff --git a/src/main/templates/screens/XImgView.BKP → ...ain/templates/screens/release/XImgView.vm b/src/main/templates/screens/XImgView.BKP → ...ain/templates/screens/release/XImgView.vm
@@ -4,7 +4,7 @@
 
 
 
-<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.pyc at 2014-09-24 19:47:25 -->
+<!-- THIS FILE WAS AUTOGENERATED BY ($XNATImageViewer)/utility-scripts/convertDemo.py at 2015-05-01 12:15:53 -->
 
 
 
@@ -17,28 +17,16 @@
 
 
 
-
+<link type="text/css" rel="stylesheet" href="$content.getURI("Demo.css")">
+<!-- BEGIN /xnat-templates/screens/XIViewer.vm -->
 <link type="text/css" rel="stylesheet" href="$content.getURI("scripts/viewer/nrg/css/nrg.css")">
 <link type="text/css" rel="stylesheet" href="$content.getURI("scripts/viewer/xiv/css/xiv.css")">
-
-<!--
-<link type="text/css" rel="stylesheet" href="$content.getURI("scripts/viewer/css/viewer.min.css")">
--->
-<script src="$content.getURI("scripts/viewer/closure-library/closure/goog/base.js")"></script>
-<script src="$content.getURI("scripts/viewer/X/xtk-deps.js")"></script>
-<script src="$content.getURI("scripts/viewer/_custom/X/xtk-custom-deps.js")"></script>
-<script src="$content.getURI("scripts/viewer/jszip/jszip.js")"></script>
-<script src="$content.getURI("scripts/viewer/nrg/nrg-deps.js")"></script>
-<script src="$content.getURI("scripts/viewer/gxnat/gxnat-deps.js")"></script>
-<script src="$content.getURI("scripts/viewer/xiv/xiv-deps.js")"></script>
 <script>
-goog.require('goog.userAgent');
-goog.require('goog.dom');
-goog.require('xiv.start');
-goog.require('xiv.ui.Modal');
-goog.require('xiv.utils.ErrorCatcher');
-goog.require('xiv.utils.ObjectAnalyzer');
+window.console.log('using xiv-min.js')
 </script>
+<script src="$content.getURI("scripts/viewer/jszip/jszip.min.js")"></script>
+<script src="$content.getURI("scripts/viewer/xiv-min.js")"></script>
+
 
 
 
@@ -53,29 +41,6 @@ goog.require('xiv.utils.ObjectAnalyzer');
 XIV_STATE = 'live';
 
 
-function displayModalError() {
-var noMobileDiv = goog.dom.createDom('div',
-{'id': 'NoMobileDiv'});
-goog.dom.classes.add(noMobileDiv, 'xiv-ui-nomobilemodal');
-
-var noMobileContent = goog.dom.createDom('div',
-{'id': 'NoMobileContent'});
-goog.dom.classes.add(noMobileContent, 'xiv-ui-nomobilemodal-content');
-noMobileContent.innerHTML =
-'The XNATImageViewer is not yet <br> supported on mobile devices :(';
-
-goog.dom.append(document.body, noMobileDiv);
-goog.dom.append(noMobileDiv, noMobileContent);
-
-noMobileDiv.onClick = function(){
-if (XIV_STATE == 'demo'){
-goog.dom.removeNode(noMobileDiv);
-}
-}
-}
-
-
-
 /**
 * Main launch function for the XNAT Image Viewer.
 * NOTES:
@@ -95,21 +60,11 @@ goog.dom.removeNode(noMobileDiv);
 */
 function launchXImgView(opt_dataPath, opt_modalState, opt_serverRoot) {
 
-
-
 //window.console.log('xiv', xiv);
 //window.console.log('compat', xiv.isCompatible);
 //window.console.log('root', xiv.prototype.setServerRoot);
 //window.console.log('states', xiv.ui.Modal);
 
-//
-// Detect Mobile display dialog
-//
-if(goog.userAgent.MOBILE) {
-displayModalError()
-return;
-}
-
 //-------------------
 // We need to set the global serverRoot property if opt_serverRoot is
 // argument is given.
@@ -122,8 +77,6 @@ serverRoot = opt_serverRoot;
 }
 
 
-
-
 //-------------------
 // Verify compatibilities (browser, WebGL, etc.)
 //-------------------

diff --git a/utility-scripts/python/convertDemo.py b/utility-scripts/python/convertDemo.py
@@ -194,19 +194,30 @@ def convertDemoToVM(demoPath):
 #
 
 def main():
+    type = os.environ.get('XIV_TYPE')
+    if type == '':
+      type = 'debug' # release, debug
+    print type 
 
     #----------------------------
     #  Params
     #----------------------------  
     imageViewerHome = os.environ.get('XNATIMAGEVIEWER_HOME')
     apacheHome = os.environ.get('CATALINA_HOME')
-    demoPath =  imageViewerHome + '/Demo.html'
+
+    # add var for production, else debug (demo/demo-min.html)
+    if (type == 'release'):
+      demoPath =  imageViewerHome + '/Demo-min.html'
+    else:
+      demoPath =  imageViewerHome + '/Demo.html'
+
     vmTargets = [
         apacheHome + '/webapps/xnat/templates/screens/XImgView.vm', 
-        imageViewerHome + '/src/main/templates/screens/XImgView.vm', 
+        imageViewerHome + '/src/main/templates/screens/' + type + '/XImgView.vm', 
     ] 
+    # if apache_home, insert apacheHome into list
     popupTargets = [
-        imageViewerHome +   '/src/main/scripts/viewer/xiv/popup.html'
+        imageViewerHome +   '/src/main/scripts/viewer/xiv/' + type + '/popup.html'
     ]