backport stable into default
authorAdrien Di Mascio <Adrien.DiMascio@logilab.fr>
Thu, 28 Apr 2011 08:20:12 +0200
changeset 7260 2b1dce628d33
parent 7257 beea955b45e2 (current diff)
parent 7259 f846f4f017b1 (diff)
child 7263 33475a31c96c
child 7273 a949fc438029
backport stable into default
--- a/web/data/cubicweb.compat.js	Wed Apr 27 12:23:43 2011 +0200
+++ b/web/data/cubicweb.compat.js	Thu Apr 28 08:20:12 2011 +0200
@@ -15,7 +15,7 @@
 
 // ========== ARRAY EXTENSIONS ========== ///
 Array.prototype.contains = cw.utils.deprecatedFunction(
-    '[3.9] array.contains(elt) is deprecated, use $.inArray(elt, array) instead',
+    '[3.9] array.contains(elt) is deprecated, use $.inArray(elt, array)!=-1 instead',
     function(element) {
         return jQuery.inArray(element, this) != - 1;
     }
--- a/web/data/cubicweb.edition.js	Wed Apr 27 12:23:43 2011 +0200
+++ b/web/data/cubicweb.edition.js	Thu Apr 28 08:20:12 2011 +0200
@@ -45,7 +45,7 @@
     var tabindex = (start == null) ? 15: start;
     cw.utils.nodeWalkDepthFirst(form, function(elem) {
         var tagName = elem.tagName.toUpperCase();
-        if ($.inArray(tagName, inputTypes)) {
+        if (jQuery.inArray(tagName, inputTypes) != -1) {
             if (jQuery(elem).attr('tabindex') != null) {
                 tabindex += 1;
                 jQuery(elem).attr('tabindex', tabindex);
@@ -58,7 +58,7 @@
 
 function showMatchingSelect(selectedValue, eid) {
     if (selectedValue) {
-        divId = 'div' + selectedValue + '_' + eid;
+        var divId = 'div' + selectedValue + '_' + eid;
         var divNode = jQuery('#' + divId);
         if (!divNode.length) {
             var args = {
--- a/web/data/cubicweb.widgets.js	Wed Apr 27 12:23:43 2011 +0200
+++ b/web/data/cubicweb.widgets.js	Thu Apr 28 08:20:12 2011 +0200
@@ -491,8 +491,8 @@
         var group = null;
         var variableRegexp = /%\((\w+)\)s/g;
         // emulates rgx.findAll()
-        while (group = variableRegexp.exec(text)) {
-            if (!$.inArray(group[1], self.variables)) {
+        while ( (group = variableRegexp.exec(text)) ) {
+            if ($.inArray(group[1], self.variables) == -1) {
                 unknownVariables.push(group[1]);
             }
             it++;