From 2f1d712eaca705577d928a1a41088cdf0921d44d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 8 Jul 2016 13:20:21 +0900 Subject: [PATCH] =?UTF-8?q?angularJS=E3=81=AE=E4=BE=9D=E5=AD=98=E6=80=A7?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E3=81=AF=E9=85=8D=E5=88=97=E3=82=A2=E3=83=8E?= =?UTF-8?q?=E3=83=86=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=BC=8F=E3=81=AB?= =?UTF-8?q?=E7=B5=B1=E4=B8=80=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/299?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/js/base.js | 6 +++--- webroot/js/color_palette_picker.js | 6 ++++-- webroot/js/title_icon_picker.js | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/webroot/js/base.js b/webroot/js/base.js index 6cb674d4..e95c5933 100644 --- a/webroot/js/base.js +++ b/webroot/js/base.js @@ -81,8 +81,8 @@ NetCommonsApp.factory('NetCommonsModal', ['$uibModal', function($uibModal) { /** * base controller */ -NetCommonsApp.controller('NetCommons.base', function( - $scope, $location) { +NetCommonsApp.controller('NetCommons.base', + ['$scope', '$location', function($scope, $location) { /** * Base URL @@ -148,4 +148,4 @@ NetCommonsApp.controller('NetCommons.base', function( $scope.sending = true; }; - }); + }]); diff --git a/webroot/js/color_palette_picker.js b/webroot/js/color_palette_picker.js index a91c3361..f99836b4 100644 --- a/webroot/js/color_palette_picker.js +++ b/webroot/js/color_palette_picker.js @@ -53,8 +53,10 @@ NetCommonsApp.directive('ncColorPalettePicker', [ } }; }]); + + NetCommonsApp.controller('ncColorPalettePickerCtrl', - function($scope, $attrs) { + ['$scope', '$attrs', function($scope, $attrs) { $scope.colorValue = $attrs.colorValue; - } + }] ); diff --git a/webroot/js/title_icon_picker.js b/webroot/js/title_icon_picker.js index 7083d7b3..bb9bcb4a 100644 --- a/webroot/js/title_icon_picker.js +++ b/webroot/js/title_icon_picker.js @@ -43,8 +43,10 @@ NetCommonsApp.directive('ncTitleIconPicker', [function() { } }; }]); + + NetCommonsApp.controller('ncTitleIconPickerCtrl', - function($scope, $attrs) { + ['$scope', '$attrs', function($scope, $attrs) { $scope.titleIcon = $attrs.titleIcon; - } + }] );