FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-03 13:45:36 +00:00
Code Issues Releases Wiki Activity

fhemweb_colorpicker.js: use loadScript to load jscolor

Browse Source 
Color.pm: don't use FHEM_colorpickerInit/$data{FWEXT}{colorpicker}{SCRIPT}


git-svn-id: https://svn.fhem.de/fhem/trunk@7516 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-01-11 09:46:39 +00:00
parent fa12df2a36
commit 02273ef79f
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/Color.pm
View File

@ -11,13 +11,13 @@ use vars qw($FW_ME);
sub sub
Color_Initialize() Color_Initialize()
{ {
FHEM_colorpickerInit(); #FHEM_colorpickerInit();
} }
sub sub
FHEM_colorpickerInit() FHEM_colorpickerInit()
{ {
$data{FWEXT}{colorpicker}{SCRIPT} = "/jscolor/jscolor.js"; #$data{FWEXT}{colorpicker}{SCRIPT} = "/jscolor/jscolor.js";
} }
my %dim_values = ( my %dim_values = (

11
fhem/www/pgm2/fhemweb_colorpicker.js
View File

@ -59,15 +59,12 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
var inp = $(newEl).find("[type=text]"); var inp = $(newEl).find("[type=text]");
loadScript("jscolor/jscolor.js",
function() {
var myPicker = new jscolor.color(inp.get(0), var myPicker = new jscolor.color(inp.get(0),
{pickerMode:'RGB',pickerFaceColor:'transparent',pickerFace:3,pickerBorder:0,pickerInsetColor:'red'}); {pickerMode:'RGB',pickerFaceColor:'transparent',pickerFace:3,pickerBorder:0,pickerInsetColor:'red'});
inp.get(0).color = myPicker; inp.get(0).color = myPicker;
if( currVal ) {
if( currVal.length > 6 ) currVal = currVal.slice(0,6);
myPicker.fromString(currVal);
}
if( elName ) if( elName )
$(inp).attr("name", elName); $(inp).attr("name", elName);
@ -79,6 +76,10 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
newEl.setValueFn = function(arg){ if( arg.length > 6 ) arg = arg.slice(0,6); newEl.setValueFn = function(arg){ if( arg.length > 6 ) arg = arg.slice(0,6);
myPicker.fromString(arg); }; myPicker.fromString(arg); };
if( currVal )
newEl.setValueFn(currVal);
});
return newEl; return newEl;
} }