Merge pull request #70 from JarvusInnovations/develop

Release: gatekeeper v2.2.0-beta.2
JarvusInnovations · Sep 5, 2019 · e8ed88c · e8ed88c
2 parents 57935ec + e8cd7f5
commit e8ed88c
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 406 deletions.
diff --git a/.holo/branches/emergence-vfs-site.toml b/.holo/branches/emergence-vfs-site.toml
diff --git a/.holo/branches/emergence-vfs-site/_layer-vfs.toml b/.holo/branches/emergence-vfs-site/_layer-vfs.toml
diff --git a/.holo/lenses/sencha-pages.toml b/.holo/lenses/sencha-pages.toml
@@ -0,0 +1,17 @@
+# forked from skeleton-v1 to add packages
+
+[hololens]
+package = "holo/lens-sencha-pages" # expanded to absolute ident in holospec
+
+[hololens.input]
+root = "sencha-workspace"
+files = [
+    "ext/**",
+    "pages/**",
+    "packages/jarvus-highlighter/**"
+]
+
+# optional and stripped from holospec:
+[hololens.output]
+root = "site-root/js/pages" # defaults to hololens.root
+merge = "overlay" # overlay / underlay / replace, defaults to overlay
diff --git a/.holo/sources/layer-vfs.toml b/.holo/sources/layer-vfs.toml
diff --git a/html-templates/endpoints/endpoints.tpl b/html-templates/endpoints/endpoints.tpl
@@ -51,14 +51,7 @@
 {block "js-bottom"}
     {$dwoo.parent}
 
-    {if $.get.jsdebug}
-        {sencha_bootstrap
-            patchLoader=false
-            packageRequirers=array('sencha-workspace/pages/src/abstractpage/TrafficStack.js', 'sencha-workspace/pages/src/pages/Endpoints.js')
-        }
-    {else}
-        <script src="{Site::getVersionedRootUrl('js/pages/Endpoints.js')}"></script>
-    {/if}
+    {jsmin "pages/Endpoints.js"}
 
     <script>
         Ext.require('Site.page.Endpoints');

diff --git a/html-templates/home.tpl b/html-templates/home.tpl
@@ -5,14 +5,7 @@
 {block "js-bottom"}
     {$dwoo.parent}
 
-    {if $.get.jsdebug}
-        {sencha_bootstrap
-            patchLoader=false
-            packageRequirers=array('sencha-workspace/pages/src/page/Portal.js')
-        }
-    {else}
-        <script src="{Site::getVersionedRootUrl('js/pages/Portal.js')}"></script>
-    {/if}
+    {jsmin "pages/Portal.js"}
 
     <script>
         Ext.require('Site.page.Portal');

diff --git a/html-templates/keys/keys.tpl b/html-templates/keys/keys.tpl
@@ -61,14 +61,7 @@
 {block "js-bottom"}
     {$dwoo.parent}
 
-    {if $.get.jsdebug}
-        {sencha_bootstrap
-            patchLoader=false
-            packageRequirers=array('sencha-workspace/pages/src/abstractpage/TrafficStack.js', 'sencha-workspace/pages/src/pages/Keys.js')
-        }
-    {else}
-        <script src="{Site::getVersionedRootUrl('js/pages/Keys.js')}"></script>
-    {/if}
+    {jsmin "pages/Keys.js"}
 
     <script>
         Ext.require('Site.page.Keys');