Netsyms/colorPicker
2
0
Fork 0
mirror of https://github.com/PitPik/colorPicker.git synced 2025-09-01 05:12:58 -06:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/PitPik/colorPicker

Browse Source 
Conflicts:
	javascript_implementation/README.md
This commit is contained in:
peterd 2014-10-10 23:50:24 +02:00
commit 426461b3c8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javascript_implementation/README.md
View File

@ -15,7 +15,11 @@ See **demo** at [dematte.at/cpn/javaScript_implementation](http://dematte.at/cpn
klass: window.ColorPicker, klass: window.ColorPicker,
input: elm, input: elm,
patch: elm, patch: elm,
<<<<<<< HEAD
init: function(elm, colors){}, // initialization callback (before colorPicker gets initialized though) init: function(elm, colors){}, // initialization callback (before colorPicker gets initialized though)
=======
init: function(elm){}, // initialization callback (before colorPicker gets initialized though)
>>>>>>> FETCH_HEAD
// animationSpeed: 200, will be supported soon // animationSpeed: 200, will be supported soon
// draggable: true, // draggable: true,
multipleInstances: false multipleInstances: false