Changeset 4767 in subversion

Timestamp:

May 14, 2011 3:25:13 AM (2 years ago)

Author:

alec

Message:

• Fixed listmenu (added workaround for ​http://bugs.jquery.com/ticket/9284)
• Small code improvements and use preferred .prop() instead of .attr() for some properties

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (10 diffs)
• skins/default/functions.js (modified) (2 diffs)

trunk/roundcubemail/program/js/app.js

@@ -395 +395 @@
         // display 'loading' message on form submit, lock submit button
         $('form').submit(function () {
-          $('input[type=submit]', this).attr('disabled', true);
+          $('input[type=submit]', this).prop('disabled', true);
           rcmail.display_message('', 'loading');
         });
@@ -4019 +4019 @@
     if (elem.length) {
       elem.show().focus();
-      $(menu).children('option[value="'+col+'"]').attr('disabled', true);
+      $(menu).children('option[value="'+col+'"]').prop('disabled', true);
     }
     else {
@@ -4043 +4043 @@
           input = $('<input>')
             .addClass('ff_'+col)
-            .attr('type', 'text')
-            .attr('name', '_'+col+name_suffix)
-            .attr('size', colprop.size)
+            .attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size})
             .appendTo(cell);
 
@@ -4052 +4050 @@
         else if (colprop.type == 'composite') {
           var childcol, cp, first;
-          for (var childcol in colprop.childs) {
+          for (childcol in colprop.childs) {
             cp = colprop.childs[childcol];
             input = $('<input>')
               .addClass('ff_'+childcol)
-              .attr('type', 'text')
-              .attr('name', '_'+childcol+name_suffix)
-              .attr('size', cp.size)
+              .attr({type: 'text', name: '_'+childcol+name_suffix, size: cp.size})
               .appendTo(cell);
             cell.append(" ");
@@ -4081 +4077 @@
           var delbutton = $('<a href="#del"></a>')
             .addClass('contactfieldbutton deletebutton')
-            .attr('title', this.get_label('delete'))
-            .attr('rel', col)
+            .attr({title: this.get_label('delete'), rel: col})
             .html(this.env.delbutton)
             .click(function(){ ref.delete_edit_field(this); return false })
@@ -4093 +4088 @@
           if (!colprop.count) colprop.count = 0;
           if (++colprop.count == colprop.limit && colprop.limit)
-            $(menu).children('option[value="'+col+'"]').attr('disabled', true);
+            $(menu).children('option[value="'+col+'"]').prop('disabled', true);
         }
       }
@@ -4120 +4115 @@
       var option = addmenu.children('option[value="'+col+'"]');
       if (option.length)
-        option.attr('disabled', false);
+        option.prop('disabled', false);
       else
         option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
@@ -4126 +4121 @@
     }
   };
-
 
   this.upload_contact_photo = function(form)
@@ -4393 +4387 @@
 
       // update subscription checkbox
-      $('input[name="_subscribed[]"]', row).val(name).attr('checked', true);
+      $('input[name="_subscribed[]"]', row).val(name).prop('checked', true);
     }
 
@@ -4502 +4496 @@
     var id = this.get_folder_row_id(folder);
     if (id)
-      $('input[name="_subscribed[]"]', $('#'+id)).attr('disabled', true);
+      $('input[name="_subscribed[]"]', $('#'+id)).prop('disabled', true);
   };
 

trunk/roundcubemail/skins/default/functions.js

@@ -177 +177 @@
     var pos = $(ref).offset();
     obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)})
-        .find(':checked').attr('checked', false);
+        .find(':checked').prop('checked', false);
 
     if (rcmail.env.search_mods) {
       var search_mods = rcmail.env.search_mods[rcmail.env.mailbox] ? rcmail.env.search_mods[rcmail.env.mailbox] : rcmail.env.search_mods['*'];
       for (var n in search_mods)
-        $('#s_mod_' + n).attr('checked', true);
+        $('#s_mod_' + n).prop('checked', true);
     }
   }
@@ -220 +220 @@
     obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
     // set form values
-    $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').attr('checked', 1);
-    $('input[name="sort_ord"][value="DESC"]').attr('checked', rcmail.env.sort_order=='DESC' ? 1 : 0);
-    $('input[name="sort_ord"][value="ASC"]').attr('checked', rcmail.env.sort_order=='DESC' ? 0 : 1);
-    $('input[name="view"][value="thread"]').attr('checked', rcmail.env.threading ? 1 : 0);
-    $('input[name="view"][value="list"]').attr('checked', rcmail.env.threading ? 0 : 1);
+    $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
+    $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
+    $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
+    $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
+    $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
     // list columns
-    var cols = $('input[name="list_col[]"]');
+    var found, cols = $('input[name="list_col[]"]');
     for (var i=0; i<cols.length; i++) {
-      var found = 0;
       if (cols[i].value != 'from')
         found = jQuery.inArray(cols[i].value, rcmail.env.coltypes) != -1;
       else
         found = (jQuery.inArray('from', rcmail.env.coltypes) != -1
-            || jQuery.inArray('to', rcmail.env.coltypes) != -1);
-      $(cols[i]).attr('checked',found ? 1 : 0);
+                || jQuery.inArray('to', rcmail.env.coltypes) != -1);
+      $(cols[i]).prop('checked', found);
     }
   }