ENH: Improved overall js css loading speed

midasplatform · Mar 24, 2011 · d35bc4b · d35bc4b
1 parent c31425e
commit d35bc4b
Show file tree

Hide file tree

Showing 16 changed files with 139 additions and 722 deletions.
diff --git a/modules/helloworld/models/base/HelloModel.php b/modules/helloworld/models/base/HelloModel.php
@@ -12,8 +12,6 @@ public function __construct()
         );
     $this->initialize(); // required
     } // end __construct()
-
-    abstract function getAll();
 
 } // end class AssetstoreModelBase
 ?>
diff --git a/modules/helloworld/models/pdo/HelloModel.php b/modules/helloworld/models/pdo/HelloModel.php
@@ -8,7 +8,7 @@ class Helloworld_HelloModel extends Helloworld_HelloModelBase
    * Return all the record in the table
    * @return Array of HelloDao
    */
-  public function getAll()
+  function getAll()
     {
     $sql=$this->database->select();
     $rowset = $this->database->fetchAll($sql);

diff --git a/public/css/layout/images/ui-bg_flat_75_ffffff_40x100.png b/public/css/layout/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/css/layout/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/css/layout/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/css/layout/images/ui-bg_glass_65_ffffff_1x400.png b/public/css/layout/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/css/layout/images/ui-bg_glass_75_dadada_1x400.png b/public/css/layout/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/css/layout/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/css/layout/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/css/layout/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/css/layout/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/css/layout/images/ui-icons_222222_256x240.png b/public/css/layout/images/ui-icons_222222_256x240.png
diff --git a/public/css/layout/images/ui-icons_454545_256x240.png b/public/css/layout/images/ui-icons_454545_256x240.png
diff --git a/public/css/layout/images/ui-icons_888888_256x240.png b/public/css/layout/images/ui-icons_888888_256x240.png
diff --git a/public/css/layout/jquery-ui.css b/public/css/layout/jquery-ui.css
diff --git a/public/js/layout/jquery-ui.js b/public/js/layout/jquery-ui.js
diff --git a/public/js/layout/jquery.js b/public/js/layout/jquery.js
diff --git a/public/js/layout/main.js b/public/js/layout/main.js
@@ -5,8 +5,8 @@ if (typeof console != "object") {
 	var console = {
 		'log':function(){}
 	};
-}
-
+} 
+console.log('test');
 $(function() { 
   json = jQuery.parseJSON($('div.jsonContent').html());
   if(!json.global.logged)

diff --git a/public/smartoptimizer/config.php b/public/smartoptimizer/config.php
@@ -22,7 +22,7 @@
 $settings['concatenate'] = true;
 
 //specifies whether to emebed files included in css files using the data URI scheme or not 
-$settings['embed'] = true;
+$settings['embed'] = false;
 }
 else
 {
@@ -60,9 +60,6 @@
 //separator for files to be concatenated
 $settings['separator'] = ',';
 
-//specifies whether to emebed files included in css files using the data URI scheme or not 
-$settings['embed'] = true;
-
 //The maximum size of an embedded file. (use 0 for unlimited size)
 $settings['embedMaxSize'] = 5120; //5KB