Changeset 1723 for ZMS

Timestamp:

09.11.2011 22:47:59 (6 months ago)

Author:

zmsdev

Message:

IE9: set X-UA-Compatible (reported by uni-bern) (29)

Location:

ZMS/trunk

Files:

• dtml/object/manage_page_header.dtml (modified) (1 diff)
• plugins/www/jquery/jquery-all.min.js (modified) (3 diffs)
• plugins/www/jquery/plugin/jquery.plugin.zmi.js (modified) (4 diffs)
• www/main.js (modified) (1 diff)

ZMS/trunk/dtml/object/manage_page_header.dtml

@@ -25 +25 @@
 <dtml-if "HTTP_USER_AGENT.find('MSIE 8.0')>=0">
  <meta http-equiv="X-UA-Compatible" content="IE=8" />
+<dtml-elif "HTTP_USER_AGENT.find('MSIE 9.0')>=0">
+ <meta http-equiv="X-UA-Compatible" content="IE=9" />
 <dtml-else>
  <dtml-comment> IE 7 Compatibility Mode </dtml-comment>

ZMS/trunk/plugins/www/jquery/jquery-all.min.js

@@ -72 +72 @@
 })}
 function zmiToggleMaximize(){toggleCookie('zmi_maximized');$('body').toggleClass('maximized')}
-function selectCheckboxes(fm,v){if(typeof v=='undefined'){v=!$(':checkbox:not([name~=active])',fm).attr('checked')}
-$(':checkbox:not([name~=active])',fm).attr('checked',v)}
+function selectCheckboxes(fm,v){if(typeof v=='undefined'){v=!$(':checkbox:not([name~=active])',fm).prop('checked')}
+$(':checkbox:not([name~=active])',fm).prop('checked',v)}
 var zmiSortableRownum=null;$(function(){var sortableTables=$("table.zmi-sortable > tbody");if(sortableTables.length > 0){var fixHelper=function(e,ui){ui.children().each(function(){$(this).width($(this).width())});return ui};$("table.zmi-sortable > tbody").sortable({helper:fixHelper,forcePlaceholderSize:true,placeholder:'ui-state-highlight',handle:'.zmiContainerColLeft img.grippy',start:function(event,ui){var trs=$('table.zmi-sortable > tbody > tr');var i=0;for(i=0;i < trs.length;i++){if($(trs[i]).attr('id')==ui.item.attr('id')){break}}
 zmiSortableRownum=i},stop:function(event,ui){var trs=$('table.zmi-sortable > tbody > tr');var i=0;for(i=0;i < trs.length;i++){if($(trs[i]).attr('id')==ui.item.attr('id')){break}}
@@ -106 +106 @@
 zmiIframe(target,data,{title:getZMILangStr('BTN_INSERT'),close:function(event,ui){$('tr#tr_manage_addProduct').remove()}
 })}
-else {$fm.attr('action',target);$fm.unbind('submit');$fm.submit()}}
+else {var $inputs=$("input:checkbox",$fm);for(var i=0;i < $inputs.length;i++){var $input=$($inputs[i]);confirm($input.attr("name")+"="+$input.val()+"["+$input.attr("checked")+"]"+"["+$input.prop("checked")+"]")}
+$fm.attr('action',target);$fm.unbind('submit');$fm.submit()}}
+function zmiActionChoose(e,id,sort_id){var fm=$(e.form);var $input=$('input[name="ids:list"][value='+id+']:checkbox',fm);var i=e.selectedIndex;var label=e.options[i].text;var action=e.options[i].value;if(action.indexOf("%s/")==0){action=id+action.substring(2,action.length)}
+if(action.indexOf('?')> 0){location.href=action}
+else {$input.prop("checked",true);if(zmiConfirmAction(fm,action,label)){zmiActionExecute(fm,e,action,id,sort_id,label)}}
+$input.prop("checked",false);e.selectedIndex=0}
 function zmiBrowseObjs(fmName,elName,lang){var elValue='';if(fmName.length>0&&elName.length>0){elValue=$('form[name='+fmName+'] input[name='+elName+']').val()}
 var title=getZMILangStr('CAPTION_CHOOSEOBJ');var href="manage_browse_iframe";href+='?lang='+lang;href+='&fmName='+fmName;href+='&elName='+elName;href+='&elValue='+escape(elValue);if(selectedText){href+='&selectedText='+escape(selectedText)}
@@ -294 +299 @@
 else if(target==""){b=false}
 return b}
-function zmiActionChoose(e,id,sort_id){var fm=$(e.form);var i=e.selectedIndex;var label=e.options[i].text;var action=e.options[i].value;if(action.indexOf("%s/")==0){action=id+action.substring(2,action.length)}
-if(action.indexOf('?')> 0){location.href=action}
-else {$("input[name=\x22ids:list\x22][value="+id+"]:checkbox",fm).attr('checked',true);if(zmiConfirmAction(fm,action,label)){zmiActionExecute(fm,e,action,id,sort_id,label)}}
-$("input[name=\x22ids:list\x22][value="+id+"]:checkbox",fm).attr('checked',false);e.selectedIndex=0}
 var zmiActionButtons=[
 {'id':'trash','standalone':false},{'id':'cut','standalone':false},{'id':'copy','standalone':false},{'id':'paste','standalone':true}

ZMS/trunk/plugins/www/jquery/plugin/jquery.plugin.zmi.js

@@ -46 +46 @@
 function selectCheckboxes(fm, v) {
         if (typeof v == 'undefined') {
-                v = !$(':checkbox:not([name~=active])',fm).attr('checked');
-        }
-        $(':checkbox:not([name~=active])',fm).attr('checked',v)
+                v = !$(':checkbox:not([name~=active])',fm).prop('checked');
+        }
+        $(':checkbox:not([name~=active])',fm).prop('checked',v)
 }
 
@@ -257 +257 @@
  * @param el
  */
-function zmiActionPopulate(el) 
-{
+function zmiActionPopulate(el) {
         if ( el.options[el.options.length-1].text.indexOf('---') != 0) {
                 return;
@@ -351 +350 @@
         }
         else {
+                var $inputs = $("input:checkbox",$fm);
+                for (var i = 0; i < $inputs.length; i++) {
+                        var $input = $($inputs[i]);
+                        confirm($input.attr("name")+"="+$input.val()+"["+$input.attr("checked")+"]"+"["+$input.prop("checked")+"]");
+                }
                 $fm.attr('action',target);
                 $fm.unbind('submit');
@@ -356 +360 @@
         }
 }
+
+/**
+ * Choose action from select.
+ *
+ * @param e
+ * @param id
+ * @param sort_id
+ */
+function zmiActionChoose(e, id, sort_id) {
+        var fm = $(e.form);
+        var $input = $('input[name="ids:list"][value='+id+']:checkbox',fm);
+        var i = e.selectedIndex;
+        var label = e.options[i].text;
+        var action = e.options[i].value;
+        if (action.indexOf("%s/") == 0) {
+                action = id + action.substring(2, action.length);
+        }
+        if (action.indexOf('?') > 0) {
+                location.href = action;
+        }
+        else {
+                // Set checkbox.
+                $input.prop( "checked", true);
+                // Confirm and execute.
+                if (zmiConfirmAction(fm,action,label)) {
+                        zmiActionExecute(fm,e,action,id,sort_id,label);
+                }
+        }
+        // Reset checkbox and select.
+        $input.prop( "checked", false);
+        e.selectedIndex = 0;
+}
+
 
 // ############################################################################

ZMS/trunk/www/main.js

@@ -83 +83 @@
 }
 
-/**
- * Choose action from select.
- *
- * @param e
- * @param id
- * @param sort_id
- */
-function zmiActionChoose(e, id, sort_id) {
-        var fm = $(e.form);
-        var i = e.selectedIndex;
-        var label = e.options[i].text;
-        var action = e.options[i].value;
-        if (action.indexOf("%s/") == 0) {
-                action = id + action.substring(2, action.length);
-        }
-        if (action.indexOf('?') > 0) {
-                location.href = action;
-        }
-        else {
-                // Set checkbox.
-                $("input[name=\x22ids:list\x22][value="+id+"]:checkbox",fm).attr( 'checked', true);
-                // Confirm and execute.
-                if (zmiConfirmAction(fm,action,label)) {
-                        zmiActionExecute(fm,e,action,id,sort_id,label);
-                }
-        }
-        // Reset checkbox and select.
-        $("input[name=\x22ids:list\x22][value="+id+"]:checkbox",fm).attr( 'checked', false);
-        e.selectedIndex = 0;
-}
-
 // -----------------------------------------------------------------------------
 //  -- Action-Buttons