diff --git a/angular-clndr.js b/angular-clndr.js index 42eaf2b..ca6223e 100644 --- a/angular-clndr.js +++ b/angular-clndr.js @@ -20,10 +20,12 @@ controller = [ "$scope", "$element", "$attrs", "$transclude", function($scope, $element, $attrs, $transclude) { return $transclude(function(clone, scope) { - var options, render; + var $clndr, options, render; $element.append(clone); - $scope.$watch('events', function(val) { - return $scope.clndr.setEvents(angular.copy(val || [])); + $scope.$watch(function() { + return JSON.stringify($scope.events || {}); + }, function(val) { + return $scope.clndr.setEvents(angular.copy($scope.events || [])); }); render = function(data) { return angular.extend(scope, data); @@ -31,7 +33,8 @@ options = angular.extend($scope.options || {}, { render: render }); - return $scope.clndr = angular.element("
").clndr(options); + $clndr = jQuery(""); + return $scope.clndr = $clndr.clndr(options); }); } ]; diff --git a/angular-clndr.min.js b/angular-clndr.min.js index 78a58cc..03c19dd 100644 --- a/angular-clndr.min.js +++ b/angular-clndr.min.js @@ -3,4 +3,4 @@ * 10KB, http://10kb.nl/ * License: MIT */ -(function(){var a,b;b=angular.module("tien.clndr",[]),a=function(){var a,b;return b={clndr:"=tienClndrObject",events:"=tienClndrEvents",options:"=?tienClndrOptions"},a=["$scope","$element","$attrs","$transclude",function(a,b,c,d){return d(function(c,d){var e,f;return b.append(c),a.$watch("events",function(b){return a.clndr.setEvents(angular.copy(b||[]))}),f=function(a){return angular.extend(d,a)},e=angular.extend(a.options||{},{render:f}),a.clndr=angular.element("").clndr(e)})}],{restrict:"E",replace:!0,transclude:!0,scope:b,controller:a}},b.directive("tienClndr",a)}).call(this); \ No newline at end of file +(function(){var a,b;b=angular.module("tien.clndr",[]),a=function(){var a,b;return b={clndr:"=tienClndrObject",events:"=tienClndrEvents",options:"=?tienClndrOptions"},a=["$scope","$element","$attrs","$transclude",function(a,b,c,d){return d(function(c,d){var e,f,g;return b.append(c),a.$watch(function(){return JSON.stringify(a.events||{})},function(b){return a.clndr.setEvents(angular.copy(a.events||[]))}),g=function(a){return angular.extend(d,a)},f=angular.extend(a.options||{},{render:g}),e=jQuery(""),a.clndr=e.clndr(f)})}],{restrict:"E",replace:!0,transclude:!0,scope:b,controller:a}},b.directive("tienClndr",a)}).call(this); \ No newline at end of file diff --git a/package.json b/package.json index 5648703..60d8e49 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,8 @@ "url": "http://10kb.mit-license.org" } ], + "version": "0.3.4", + "main": "./angular-clndr.js", "dependencies": {}, "devDependencies": { "grunt": "~0.4.5", diff --git a/src/angular-clndr.coffee b/src/angular-clndr.coffee index d5ad72d..7b1310e 100644 --- a/src/angular-clndr.coffee +++ b/src/angular-clndr.coffee @@ -17,8 +17,10 @@ TienClndrDirective = -> $element.append(clone) # watch events from tien-clndr-events attribute - $scope.$watch 'events', (val) -> - $scope.clndr.setEvents(angular.copy(val || [])) + $scope.$watch () -> + return JSON.stringify($scope.events || {}) + , (val) -> + $scope.clndr.setEvents(angular.copy($scope.events || [])) # extend all CLNDR data to scope render = (data) -> @@ -27,8 +29,9 @@ TienClndrDirective = -> # create options object for optional CLNDR settings options = angular.extend($scope.options || {}, render: render) - # init CLNDR in virtual DOM-element - $scope.clndr = angular.element("").clndr(options) + # init CLNDR in virtual DOM-element, and it must use jQuery. + $clndr = jQuery(""); + $scope.clndr = $clndr.clndr(options) ] return {restrict: 'E', replace: true, transclude: true, scope: scope, controller: controller}