From be9dc76860b29e68e73847570dff3a2ca2efbff9 Mon Sep 17 00:00:00 2001 From: justme1968 Date: Fri, 23 Jan 2015 01:41:28 +0000 Subject: [PATCH] fhemweb_colorpicker.js: added temporary setValueFn before loadScript callback for jscolor git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7663 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb_colorpicker.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fhem/www/pgm2/fhemweb_colorpicker.js b/fhem/www/pgm2/fhemweb_colorpicker.js index 72965a08d..f9fba2d52 100644 --- a/fhem/www/pgm2/fhemweb_colorpicker.js +++ b/fhem/www/pgm2/fhemweb_colorpicker.js @@ -8,6 +8,9 @@ FW_widgets['colorpicker'] = { function FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd) { + if(!vArr.length || vArr[0] != "colorpicker") + return undefined; + if( 0 ) { console.log( "elName: "+elName ); console.log( "devName: "+devName ); @@ -18,10 +21,6 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd) console.log( "cmd: "+cmd ); } - if(!vArr.length || vArr[0] != "colorpicker") - return undefined; - - var mode = "RGB"; if( vArr.length >= 1 ) mode = vArr[1] @@ -59,6 +58,8 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd) var inp = $(newEl).find("[type=text]"); + newEl.setValueFn = function(arg){ if( arg.length > 6 ) arg = arg.slice(0,6); $(inp).val(arg); } + loadScript("jscolor/jscolor.js", function() { var myPicker = new jscolor.color(inp.get(0),