fix jscolor input in jqgrid

Julien Verneuil
1 parent 1ea67eb5
Showing 2 changed files with 6 additions and 6 deletions Show diff stats
view/jqgrid.anubis
view/view_table_renderer.anubis
@@ -64,7 +64,7 @@ define String
       var el = document.createElement('input');
       el.type='text';
       el.value = value;
-      var myPicker = new jscolor.color(el, {});
+      var myPicker = new jscolor(el);
       myPicker.fromString(value);
       return el;
     },
@@ -130,7 +130,7 @@ define String
      date(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true, formatter: \"date\", formatoptions: { newformat: \"Y-M-d\" }}", 
      time(label,column_name,help)                   then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true }",
      datetime(label,column_name,help)               then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true }",
-     color(label, column_name, help)                then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", width: 40, editable:true, autoResizable: true, formatter:formatColor, unformat:unformatColor, "+custom_edit_color+" }",
+     color(label, column_name, help)                then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", width: 40, editable:true, autoResizable: true, edittype: 'custom', formatter:formatColor, unformat:unformatColor, "+custom_edit_color+" }",
      phone(label,column_name, ph_type, help)        then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true, edittype: 'custom', formatter:formatPhone, unformat:unformatPhone, "+custom_edit_phone+"}",
      email(label,column_name, help)                 then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true, edittype: 'custom', formatter:formatEmail, unformat:unformatEmail, "+custom_edit_email+"}",
      url(label, column_name, help)                  then "{ name: \""+column_name+"\", label: \""+_T(label)+"\", editable:true, autoResizable: true, "+search_options(column_name)+" }",
@@ -437,15 +437,15 @@ url:&#39;?aws_controller=hk_c&amp;aws_action=grid_view&amp;table_name=&quot;+rows.table_name+&quot;&amp;vi
 //   rows.json_data_string+
    jqGrid_options(uid, rows, _T)+
    ",loadComplete: function () {
-    jscolor.installByClassName(\"jscolor\");
+
    }
    }).jqGrid(\"gridResize\");
    function formatColor(cellValue, options, rowObject) {
-            var colorInput = \"<input class=\\\"jscolor\\\" value=\\\"\"+ cellValue + \"\\\">\";
-            return colorInput;
+            var color_container = \"<div class=\\\"hk_jscolor\\\" data-color=\\\"\"+ cellValue + \"\\\" style=\\\"background-color:#\"+ cellValue + \"\\\"></div>\";
+            return color_container;
         }
    function unformatColor(cellValue, options, cellObject) {
-            return $(cellObject.html()).css(\"backgroundColor\").substring(1);
+            return $(cellObject).find('.jscolor').data('color');
         }
    function formatPhone(cellValue, options, rowObject) {
             var phoneInput = '<span class=\"hk_phone_call\"><img data-phone-number=\"'+cellValue+'\" src=\\\"/icons/16x16/phone.png\\\" onclick=\"hk_phone_call(this);\">' + cellValue + '</span>';