IE8 Debugging

pydio · Jan 14, 2014 · ee8067b · ee8067b
1 parent afdb66f
commit ee8067b
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 9 deletions.
diff --git a/core/src/core/classes/class.AJXP_JSPacker.php b/core/src/core/classes/class.AJXP_JSPacker.php
@@ -42,6 +42,9 @@ public function pack()
             AJXP_JSPacker::concatListAndPack($list,
                                              $scriptName,
                                             "Normal");
+            if(isSet($_GET["separate"])){
+                self::compactEach($list, "Normal");
+            }
         }
         $sList = glob(AJXP_THEME_FOLDER."/css/*_list.txt");
         foreach ($sList as $list) {
@@ -91,4 +94,26 @@ public function concatListAndPack($src, $out, $mode)
         return true;
     }
 
+    public function compactEach($list, $mode){
+        $lines = file($list);
+        require_once("packer/class.JavaScriptPacker.php");
+        $fullcode = '';
+        foreach($lines as $line){
+            $in = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($line,"\n\r");
+            $out = str_replace("/js/", "/js/min/", $in);
+            $outfull = str_replace(".js", ".full.js", $out);
+            $jscode = file_get_contents($in);
+            $fullcode .= $jscode;
+            // Pack and write to file
+            $packer = new JavaScriptPacker($jscode, $mode , true, false);
+            $packed = $packer->pack();
+            file_put_contents($out, $packed);
+
+            // Pack and write to file
+            $packer = new JavaScriptPacker($fullcode, $mode , true, false);
+            $packed = $packer->pack();
+            file_put_contents($outfull, $packed);
+        }
+    }
+
 }
diff --git a/core/src/core/classes/class.AJXP_XMLWriter.php b/core/src/core/classes/class.AJXP_XMLWriter.php
@@ -248,6 +248,7 @@ public static function replaceAjxpXmlKeywords($xml, $stripSpaces = false)
             //$xml = str_replace("AJXP_THEME_FOLDER", AJXP_THEME_FOLDER, $xml);
             $xml = str_replace("AJXP_SERVER_ACCESS", AJXP_SERVER_ACCESS, $xml);
         }
+        $xml = str_replace("AJXP_APPLICATION_TITLE", ConfService::getCoreConf("APPLICATION_TITLE"), $xml);
         $xml = str_replace("AJXP_MIMES_EDITABLE", AJXP_Utils::getAjxpMimes("editable"), $xml);
         $xml = str_replace("AJXP_MIMES_IMAGE", AJXP_Utils::getAjxpMimes("image"), $xml);
         $xml = str_replace("AJXP_MIMES_AUDIO", AJXP_Utils::getAjxpMimes("audio"), $xml);

diff --git a/core/src/plugins/core.auth/standard_auth_actions.xml b/core/src/plugins/core.auth/standard_auth_actions.xml
@@ -91,8 +91,8 @@
 									ajaxplorer.loadSeedOrCaptcha(oForm.down('#login_seed'), oForm.down('img#captcha_image'), oForm.down('div.dialogLegend'), 'before');
 								}
 								if(success){
-        						    $("generic_dialog_box").down(".dialogTitle").setAttribute("style", "");
-        						    oForm.up('.dialogContent').setAttribute("style", "");
+        						    $("generic_dialog_box").down(".dialogTitle").writeAttribute("style", "");
+        						    oForm.up('.dialogContent').writeAttribute("style", "");
     						        $("generic_dialog_box").select("#progressCustomMessage").invoke("remove");
         						}
 

diff --git a/core/src/plugins/gui.ajax/res/html/gui.html b/core/src/plugins/gui.ajax/res/html/gui.html
@@ -1,6 +1,6 @@
 <html xmlns:ajxp>
 	<head>
-		<title>Pydio</title>
+		<title>AJXP_APPLICATION_TITLE</title>
         AJXP_REBASE
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">

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/class.AjxpUsersCompleter.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpUsersCompleter.js
@@ -187,7 +187,7 @@ Class.create("AjxpUsersCompleter", Ajax.Autocompleter, {
                             name: "send_email",
                             scope: "user",
                             type: "boolean",
-                            default: "",
+                            "default": "",
                             mandatory: true
                         }));
                         var definitions = f.parseParameters(ajaxplorer.getXmlRegistry(), params.join('|'));

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -2085,8 +2085,12 @@ Class.create("FilesList", SelectableElements, {
 		elList.each(function(element){
             //if(element.up('div.thumbnail_selectable_cell.detailed')) return;
 			var node = element.ajxpNode;
-			var image_element = element.IMAGE_ELEMENT || element.down('img');
-			var label_element = element.LABEL_ELEMENT || element.down('.thumbLabel');
+            try{
+                var image_element = element.IMAGE_ELEMENT || element.down('img');
+                var label_element = element.LABEL_ELEMENT || element.down('.thumbLabel');
+            }catch(e){
+                return;
+            }
             var elementsAreSiblings = (label_element && (label_element.siblings().indexOf(image_element) !== -1));
             var tSize = (this._displayMode=='detail'? this._detailThumbSize:this._thumbSize);
             if(element.down('div.thumbnail_selectable_cell')){

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js
@@ -391,7 +391,9 @@ Class.create("SearchEngine", AjxpPane, {
         }else{
             $(this._ajxpOptions.toggleResultsVisibility).setStyle({display:'none'});
         }
-        this._fileList.showElement(show);
+        if(this._fileList) {
+            this._fileList.showElement(show);
+        }
     },
 
 	/**

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/html/gui.html b/core/src/plugins/gui.ajax/res/themes/vision/html/gui.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:ajxp>
 	<head>
-		<title>Pydio</title>
+		<title>AJXP_APPLICATION_TITLE</title>
         AJXP_REBASE
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">