From 1608c4267865027f58a9545cf16fb901e2983ebd Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 23 Jul 2014 15:03:25 +0200 Subject: [PATCH] Fixing color selection --- app/coffee/modules/admin/project-values.coffee | 5 +++++ app/partials/views/components/select-color.jade | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee index a7023f28..da1f2805 100644 --- a/app/coffee/modules/admin/project-values.coffee +++ b/app/coffee/modules/admin/project-values.coffee @@ -252,6 +252,9 @@ ColorSelectionDirective = () -> link = ($scope, $el, $attrs, $model) -> $ctrl = $el.controller() + $scope.$watch $attrs.ngModel, (element) -> + $scope.color = element.color + $el.on "click", ".current-color", (event) -> # Showing the color selector event.preventDefault() @@ -276,6 +279,8 @@ ColorSelectionDirective = () -> $el.on "click", ".select-color .selected-color", (event) -> event.preventDefault() + $scope.$apply -> + $model.$modelValue.color = $scope.color $el.find(".select-color").hide() $scope.$on "$destroy", -> diff --git a/app/partials/views/components/select-color.jade b/app/partials/views/components/select-color.jade index c01f418d..0a519b2d 100644 --- a/app/partials/views/components/select-color.jade +++ b/app/partials/views/components/select-color.jade @@ -22,5 +22,5 @@ div.popover.select-color li.color(style="background: #a40000", data-color="#a40000") li.color(style="background: #2e3436", data-color="#2e3436") - input(type="text", placeholder="personalized colors", ng-model="status.color") - div.selected-color(style="background-color: {{ status.color }}") + input(type="text", placeholder="personalized colors", ng-model="color") + div.selected-color(style="background-color: {{ color }}")