AMBARI-480. Reduce Page Load Time By Combining HMC JS Files (Contributed by Varun)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347301 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-480. Reduce Page Load Time By Combining HMC JS Files (Varun via Vikram)
+
   AMBARI-479. Add nodes after install does not allow re-bootstrap if user closes browser after bootstrap and before starting services (Vikram)
 
   AMBARI-477. Spec file for using installer with php-5.3 (Hitesh via Vikram)

hmc/html/addNodesWizard.php

@@ -126,13 +126,13 @@
     };
   
     var jsFilesToLoad = [ 
-        '../js/utils.js', 
-        '../js/txnUtils.js',
-        '../js/addNodes.js', 
-        '../js/addNodesProgress.js', 
-        '../js/selectComponents.js', 
-        '../js/deployAddedNodesProgress.js', 
-        '../js/addNodesWizardInit.js'
+        'js/utils.js', 
+        'js/txnUtils.js',
+        'js/addNodes.js', 
+        'js/addNodesProgress.js', 
+        'js/selectComponents.js', 
+        'js/deployAddedNodesProgress.js', 
+        'js/addNodesWizardInit.js'
       ];
     </script>
   

hmc/html/bootstrapJs.htmli

@@ -2,25 +2,9 @@
 
 <script type="text/javascript">
 
-  /* Loads the next file from the global jsFilesToLoad array (destroying it 
-   * in the process).
-   */
-  function loadNextJsFile() {
-
-    if( jsFilesToLoad.length > 0 ) {
-
-      var dynamicJsScript = document.createElement("script");
-      dynamicJsScript.type = "text/javascript";
-      dynamicJsScript.src = jsFilesToLoad.shift();
-      globalYui.log('Loading ' + dynamicJsScript.src);
-      dynamicJsScript.onload = loadNextJsFile;
-      document.getElementsByTagName("head")[0].appendChild(dynamicJsScript);
-    }
-  }
-
   var globalYuiLoaderOptions = {
     combine: true,
-    comboBase: '../yuiCombinator.php?',
+    comboBase: '../fileCombinator.php?',
     root: 'yui-3.5.1/build/'
   };
 
@@ -30,8 +14,12 @@
     "datasource-polling", "stylesheet", "dd-drop", "dd-constrain",
     "dd-proxy", "transition", "overlay", "node-event-simulate", function (Y) {
 
-      /* Kick off the sequential loading. */
-      loadNextJsFile();
+      /* Load all the files in jsFilesToLoad in one shot. */
+      var dynamicJsScript = document.createElement("script");
+      dynamicJsScript.type = "text/javascript";
+      dynamicJsScript.src = '../fileCombinator.php?' + jsFilesToLoad.join('&');
+      globalYui.log('Loading ' + dynamicJsScript.src);
+      document.getElementsByTagName("head")[0].appendChild(dynamicJsScript);
 
     });
 </script>

hmc/html/index.php

@@ -38,8 +38,8 @@
     <script type="text/javascript">
 
       var jsFilesToLoad = [ 
-        '../js/utils.js',
-        '../js/clustersList.js' 
+        'js/utils.js',
+        'js/clustersList.js' 
       ];
     </script>
 

hmc/html/initializeCluster.php

@@ -309,21 +309,21 @@
             };
 
             var jsFilesToLoad = [
-                '../js/ext/jquery.min.js',
-                '../js/ext/bootstrap.min.js',
-                '../js/utils.js', 
-                '../js/txnUtils.js',
-                '../js/installationWizard.js',
-                '../js/createCluster.js',
-                '../js/addNodes.js',
-                '../js/addNodesProgress.js',
-                '../js/selectServices.js',
-                '../js/assignMasters.js',
-                '../js/configureCluster.js',
-                '../js/configureServicesUtils.js',
-                '../js/configureServices.js',
-                '../js/reviewAndDeploy.js',
-                '../js/deployProgress.js'                  
+                'js/ext/jquery.min.js',
+                'js/ext/bootstrap.min.js',
+                'js/utils.js', 
+                'js/txnUtils.js',
+                'js/installationWizard.js',
+                'js/createCluster.js',
+                'js/addNodes.js',
+                'js/addNodesProgress.js',
+                'js/selectServices.js',
+                'js/assignMasters.js',
+                'js/configureCluster.js',
+                'js/configureServicesUtils.js',
+                'js/configureServices.js',
+                'js/reviewAndDeploy.js',
+                'js/deployProgress.js'                  
               ];
             </script>
 

hmc/html/manageServices.php

@@ -97,11 +97,11 @@
       var clusterName = '<?php echo $_GET['clusterName']; ?>';
 
       var jsFilesToLoad = [ 
-        '../js/utils.js',
-        '../js/txnUtils.js',
-        '../js/configureServicesUtils.js',
-        '../js/manageServices.js',
-        '../js/manageServicesProgress.js'
+        'js/utils.js',
+        'js/txnUtils.js',
+        'js/configureServicesUtils.js',
+        'js/manageServices.js',
+        'js/manageServicesProgress.js'
       ];
     </script>
 

hmc/html/showDeployProgress.php

@@ -32,10 +32,10 @@
       var clusterName = '<?php echo $clusterName; ?>';
 
       var jsFilesToLoad = [ 
-        '../js/utils.js',
-        '../js/txnUtils.js',
-        '../js/deployProgress.js',
-        '../js/showDeployProgress.js' 
+        'js/utils.js',
+        'js/txnUtils.js',
+        'js/deployProgress.js',
+        'js/showDeployProgress.js' 
       ];
     </script>
 

hmc/html/showManageServicesProgress.php

@@ -32,10 +32,10 @@
       var clusterName = '<?php echo $clusterName; ?>';
 
       var jsFilesToLoad = [ 
-        '../js/utils.js',
-        '../js/txnUtils.js',
-        '../js/manageServicesProgress.js',
-        '../js/showManageServicesProgress.js' 
+        'js/utils.js',
+        'js/txnUtils.js',
+        'js/manageServicesProgress.js',
+        'js/showManageServicesProgress.js' 
       ];
     </script>
 

hmc/html/showUninstallProgress.php

@@ -32,10 +32,10 @@
       var clusterName = '<?php echo $clusterName; ?>';
 
       var jsFilesToLoad = [ 
-        '../js/utils.js',
-        '../js/txnUtils.js',
-        '../js/uninstallProgress.js',
-        '../js/showUninstallProgress.js' 
+        'js/utils.js',
+        'js/txnUtils.js',
+        'js/uninstallProgress.js',
+        'js/showUninstallProgress.js' 
       ];
     </script>
 

hmc/html/uninstallWizard.php

@@ -82,10 +82,10 @@
     };
 
     var jsFilesToLoad = [ 
-        '../js/utils.js', 
-        '../js/txnUtils.js',
-        '../js/uninstall.js', 
-        '../js/uninstallProgress.js', 
+        'js/utils.js', 
+        'js/txnUtils.js',
+        'js/uninstall.js', 
+        'js/uninstallProgress.js', 
       ];
     </script>
 

hmc/package/rpm/SPECS/hmc.spec

@@ -101,7 +101,7 @@ fi
 %__cp -rf puppet $RPM_BUILD_ROOT/%{web_prefixdir}/
 %__cp -rf php $RPM_BUILD_ROOT/%{web_prefixdir}/
 %__cp -rf yui-3.5.1 $RPM_BUILD_ROOT/%{web_prefixdir}/
-%__cp -f yuiCombinator.php $RPM_BUILD_ROOT/%{web_prefixdir}/
+%__cp -f fileCombinator.php $RPM_BUILD_ROOT/%{web_prefixdir}/
 %__cp -rf conf $RPM_BUILD_ROOT/%{web_prefixdir}/
 %__cp -rf puppet/manifestloader $RPM_BUILD_ROOT/%{puppet_master_dir}
 %__cp -rf puppet/modules $RPM_BUILD_ROOT/%{puppet_master_dir}

hmc/package/rpm/create_hmc_rpm.sh

@@ -55,7 +55,7 @@ cp -rf ${BASEDIR}/../../php ${HMC_DIR}
 cp -rf ${BASEDIR}/../../yui-3.5.1 ${HMC_DIR}
 cp -rf ${BASEDIR}/../../conf ${HMC_DIR}
 cp -rf ${BASEDIR}/../../fonts ${HMC_DIR}
-cp -f ${BASEDIR}/../../yuiCombinator.php ${HMC_DIR}
+cp -f ${BASEDIR}/../../fileCombinator.php ${HMC_DIR}
 TAR_DEST="${BUILD_DIR}/${PKG_NAME}-$VERSION.tar.gz"
 
 cd ${BUILD_DIR};