Split scripts into boot, core and ui. Currently boot is compiled old …

…fashioned way, core is compressed & mangled, ui is compressed only.
pydio · May 7, 2015 · 1bbd8bc · 1bbd8bc
1 parent 1c08727
commit 1bbd8bc
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 32 deletions.
diff --git a/core/src/plugins/action.share/res/minisite.php b/core/src/plugins/action.share/res/minisite.php
@@ -199,6 +199,7 @@
             }
         </style>
         <script language="javascript" type="text/javascript" src="plugins/gui.ajax/res/js/ajaxplorer_boot.js"></script>
+        <script language="javascript" type="text/javascript" src="plugins/gui.ajax/res/js/ajaxplorer_core.js"></script>
         <script type="text/javascript">
             var ajaxplorer, MessageHash={};
             var startParameters = {

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt b/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt
@@ -0,0 +1,21 @@
+js/vendor/prototype/es6compat.js
+js/core/lang/Observable.js
+js/core/lang/Logger.js
+js/core/util/LangUtils.js
+js/core/util/XMLUtils.js
+js/core/util/PathUtils.js
+js/core/util/HasherUtils.js
+js/core/model/Router.js
+js/core/model/AjxpNode.js
+js/core/model/User.js
+js/core/http/ResourcesManager.js
+js/core/model/RemoteNodeProvider.js
+js/core/model/EmptyNodeProvider.js
+js/core/model/Repository.js
+js/core/model/BackgroundTasksManager.js
+js/core/http/PydioApi.js
+js/core/model/Action.js
+js/core/model/Controller.js
+js/core/model/PydioDataModel.js
+js/core/model/Registry.js
+js/core/Pydio.js
diff --git a/...ugins/gui.ajax/res/js/ajaxplorer_list.txt → ...plugins/gui.ajax/res/js/ajaxplorer_ui.txt b/...ugins/gui.ajax/res/js/ajaxplorer_list.txt → ...plugins/gui.ajax/res/js/ajaxplorer_ui.txt
@@ -1,11 +1,3 @@
-js/core/lang/Observable.js
-js/core/lang/Logger.js
-js/core/util/LangUtils.js
-js/core/util/XMLUtils.js
-js/core/util/PathUtils.js
-js/core/util/HasherUtils.js
-js/core/model/Router.js
-js/core/model/AjxpNode.js
 js/ui/prototype/interfaces/class.IAjxpNodeProvider.js
 js/ui/prototype/interfaces/class.IAjxpWidget.js
 js/ui/prototype/interfaces/class.IActionProvider.js
@@ -19,7 +11,6 @@ js/vendor/prototype/splitter.js
 js/vendor/prototype/cookiejar.js
 js/vendor/prototype/protopass.js
 js/vendor/prototype/resizable.js
-js/vendor/prototype/es6compat.js
 js/vendor/leightbox/lightbox.js
 js/vendor/scriptaculous/src/builder.js
 js/vendor/scriptaculous/src/effects.js
@@ -34,17 +25,6 @@ js/vendor/webfx/xtree.js
 js/vendor/webfx/ajxptree.js
 js/vendor/chosen/event.simulate.js
 js/vendor/chosen/chosen.proto.js
-js/core/model/User.js
-js/core/http/ResourcesManager.js
-js/core/model/RemoteNodeProvider.js
-js/core/model/EmptyNodeProvider.js
-js/core/model/Repository.js
-js/core/model/BackgroundTasksManager.js
-js/core/http/PydioApi.js
-js/core/model/Action.js
-js/core/model/Controller.js
-js/core/model/PydioDataModel.js
-js/core/model/Registry.js
 js/ui/prototype/class.AjxpDraggable.js
 js/ui/prototype/class.AjxpSortable.js
 js/ui/prototype/class.AjxpTabulator.js
@@ -77,5 +57,4 @@ js/ui/prototype/class.FormManager.js
 js/ui/prototype/class.DataModelProperty.js
 js/ui/prototype/class.MultiDownloader.js
 js/ui/prototype/class.ActivityMonitor.js
-js/ui/prototype/class.PydioUI.js
-js/core/Pydio.js
+js/ui/prototype/class.PydioUI.js
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html b/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html
@@ -8,6 +8,7 @@
         <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
         AJXP_ADDITIONAL_JS_FRAMEWORKS
         <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
+        <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_core.js?v=AJXP_CURRENT_VERSION"></script>
         <link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
     </head>
 	<body style="overflow: hidden;">
@@ -20,6 +21,7 @@
 		//AJXP_JSON_START_PARAMETERS
         document.observe("ajaxplorer:before_gui_load", function(e){
             ajaxplorer.currentThemeUsesIconFonts = true;
+            pydio.Parameters.set('currentThemeUsesIconFonts', true);
             document.documentElement.className += " ajxp_theme_orbit";
         });
         window.ajxpBootstrap = new AjxpBootstrap(startParameters);

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html b/core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html
@@ -40,16 +40,14 @@
 window.ajxpBootstrap = new AjxpBootstrap(startParameters);
     </script>
     <?php
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_list.txt";
+$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_core.txt";
 $lines = file($list);
 foreach ($lines as $line){
-/*
-$es6Version = str_replace(array("pydio/", "class."), array("core/", ""), $line);
-$realFile = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".trim($es6Version);
-if(file_exists($realFile)) {
-    $line = $es6Version;
+	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
 }
-*/
+$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_ui.txt";
+$lines = file($list);
+foreach ($lines as $line){
 	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
 }
 ?>
@@ -82,6 +80,7 @@
         <script type="text/javascript">
         document.observe("ajaxplorer:before_gui_load", function(e){
             ajaxplorer.currentThemeUsesIconFonts = true;
+            pydio.Parameters.set('currentThemeUsesIconFonts', true);
             document.documentElement.className += " ajxp_theme_orbit";
         });
     </script>