taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing initial color in color selector

stable
Alejandro Alonso 2016-09-08 09:31:10 +02:00 committed by David Barragán Merino
parent 14e53ec76b
commit 8b5830a33f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/modules/components/color-selector/color-selector.controller.coffee
View File

@ -24,12 +24,11 @@ getDefaulColorList = taiga.getDefaulColorList
class ColorSelectorController class ColorSelectorController
constructor: () -> constructor: () ->
@.colorList = getDefaulColorList() @.colorList = getDefaulColorList()
if @.initColor
@.color = @.initColor
@.displayColorList = false @.displayColorList = false
setColor: (color) ->
@.color = @.initColor
resetColor: () -> resetColor: () ->
if @.isRequired and not @.color if @.isRequired and not @.color
@.color = @.initColor @.color = @.initColor

5
app/modules/components/color-selector/color-selector.directive.coffee
View File

@ -17,6 +17,8 @@
# File: color-selector.directive.coffee # File: color-selector.directive.coffee
### ###
bindOnce = @.taiga.bindOnce
ColorSelectorDirective = ($timeout) -> ColorSelectorDirective = ($timeout) ->
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
# Animation # Animation
@ -42,6 +44,9 @@ ColorSelectorDirective = ($timeout) ->
.mouseenter(cancel) .mouseenter(cancel)
.mouseleave(close) .mouseleave(close)
bindOnce scope, 'vm.initColor', (color) ->
ctrl.setColor(color)
return { return {
link: link, link: link,
templateUrl:"components/color-selector/color-selector.html", templateUrl:"components/color-selector/color-selector.html",