Changeset 28039


Ignore:
Timestamp:
Apr 1, 2014, 3:11:14 PM (6 years ago)
Author:
plg
Message:

merge r28038 from branch 2.6 to trunk

bug 3068 fixed: on Internet Explorer 8, indexOf function is broken.

Location:
trunk/admin/themes/default
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/js/common.js

    r26179 r28039  
    77  for (var o = []; m > 0; o[--m] = i);
    88  return o.join('');
     9}
     10
     11if (!Array.prototype.indexOf)
     12{
     13  Array.prototype.indexOf = function(elt /*, from*/)
     14  {
     15    var len = this.length;
     16
     17    var from = Number(arguments[1]) || 0;
     18    from = (from < 0)
     19         ? Math.ceil(from)
     20         : Math.floor(from);
     21    if (from < 0)
     22      from += len;
     23
     24    for (; from < len; from++)
     25    {
     26      if (from in this &&
     27          this[from] === elt)
     28        return from;
     29    }
     30    return -1;
     31  };
    932}
    1033
  • trunk/admin/themes/default/template/user_list.tpl

    r27837 r28039  
    3131
    3232var truefalse = {
    33   true:"{'Yes'|translate}",
    34   false:"{'No'|translate}",
     33  'true':"{'Yes'|translate}",
     34  'false':"{'No'|translate}",
    3535};
    3636{/footer_script}
Note: See TracChangeset for help on using the changeset viewer.