From 39ff210e4c4a48ff02049183777c6ecf94458d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 14:42:55 +0800 Subject: [PATCH 1/6] update package json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5648703..3fa13c9 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "url": "http://10kb.mit-license.org" } ], + "main": "./angular-clndr.js", "dependencies": {}, "devDependencies": { "grunt": "~0.4.5", From aff3d46e3396a34848784ab431e1273f19b94615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 14:44:18 +0800 Subject: [PATCH 2/6] version --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 3fa13c9..e954df0 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "url": "http://10kb.mit-license.org" } ], + "version": "0.3.3", "main": "./angular-clndr.js", "dependencies": {}, "devDependencies": { From 923b7ef251ed895d0451d59c317d517556f8f21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 17:51:53 +0800 Subject: [PATCH 3/6] watch events --- angular-clndr.js | 4 +++- angular-clndr.min.js | 2 +- package.json | 2 +- src/angular-clndr.coffee | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/angular-clndr.js b/angular-clndr.js index 42eaf2b..6974b68 100644 --- a/angular-clndr.js +++ b/angular-clndr.js @@ -22,7 +22,9 @@ return $transclude(function(clone, scope) { var options, render; $element.append(clone); - $scope.$watch('events', function(val) { + $scope.$watch(function() { + return reutrn(JSON.stringify($scope.events || {})); + }, function(val) { return $scope.clndr.setEvents(angular.copy(val || [])); }); render = function(data) { diff --git a/angular-clndr.min.js b/angular-clndr.min.js index 78a58cc..b562575 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;return b.append(c),a.$watch(function(){return reutrn(JSON.stringify(a.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 diff --git a/package.json b/package.json index e954df0..60d8e49 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "http://10kb.mit-license.org" } ], - "version": "0.3.3", + "version": "0.3.4", "main": "./angular-clndr.js", "dependencies": {}, "devDependencies": { diff --git a/src/angular-clndr.coffee b/src/angular-clndr.coffee index d5ad72d..1ccc990 100644 --- a/src/angular-clndr.coffee +++ b/src/angular-clndr.coffee @@ -17,7 +17,9 @@ TienClndrDirective = -> $element.append(clone) # watch events from tien-clndr-events attribute - $scope.$watch 'events', (val) -> + $scope.$watch () -> + return JSON.stringify($scope.events || {}) + , (val) -> $scope.clndr.setEvents(angular.copy(val || [])) # extend all CLNDR data to scope From 58730da7e0e37b2a6dd992def80b1d1b3c3c01a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 18:20:30 +0800 Subject: [PATCH 4/6] update return err. --- angular-clndr.js | 2 +- angular-clndr.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/angular-clndr.js b/angular-clndr.js index 6974b68..2429b18 100644 --- a/angular-clndr.js +++ b/angular-clndr.js @@ -23,7 +23,7 @@ var options, render; $element.append(clone); $scope.$watch(function() { - return reutrn(JSON.stringify($scope.events || {})); + return JSON.stringify($scope.events || {}); }, function(val) { return $scope.clndr.setEvents(angular.copy(val || [])); }); diff --git a/angular-clndr.min.js b/angular-clndr.min.js index b562575..7823d7d 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(function(){return reutrn(JSON.stringify(a.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;return b.append(c),a.$watch(function(){return JSON.stringify(a.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 From 6a78cc1734d3904df61488cd2a2ccc4601a74d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 18:25:36 +0800 Subject: [PATCH 5/6] update elem create method. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit incase that someone don’t use jquery inside angular but use outside. --- angular-clndr.js | 5 +++-- angular-clndr.min.js | 2 +- src/angular-clndr.coffee | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/angular-clndr.js b/angular-clndr.js index 2429b18..6255343 100644 --- a/angular-clndr.js +++ b/angular-clndr.js @@ -20,7 +20,7 @@ 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(function() { return JSON.stringify($scope.events || {}); @@ -33,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 7823d7d..1dba9a6 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(function(){return JSON.stringify(a.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(b||[]))}),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/src/angular-clndr.coffee b/src/angular-clndr.coffee index 1ccc990..c31d48e 100644 --- a/src/angular-clndr.coffee +++ b/src/angular-clndr.coffee @@ -29,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} From 3b3b5f1879ca7a8c46f8c853b227dc7dde5581e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=A5=87=E8=BE=89?= Date: Mon, 13 Jun 2016 18:31:59 +0800 Subject: [PATCH 6/6] set option. --- angular-clndr.js | 2 +- angular-clndr.min.js | 2 +- src/angular-clndr.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/angular-clndr.js b/angular-clndr.js index 6255343..ca6223e 100644 --- a/angular-clndr.js +++ b/angular-clndr.js @@ -25,7 +25,7 @@ $scope.$watch(function() { return JSON.stringify($scope.events || {}); }, function(val) { - return $scope.clndr.setEvents(angular.copy(val || [])); + return $scope.clndr.setEvents(angular.copy($scope.events || [])); }); render = function(data) { return angular.extend(scope, data); diff --git a/angular-clndr.min.js b/angular-clndr.min.js index 1dba9a6..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,g;return b.append(c),a.$watch(function(){return JSON.stringify(a.events||{})},function(b){return a.clndr.setEvents(angular.copy(b||[]))}),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 +(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/src/angular-clndr.coffee b/src/angular-clndr.coffee index c31d48e..7b1310e 100644 --- a/src/angular-clndr.coffee +++ b/src/angular-clndr.coffee @@ -20,7 +20,7 @@ TienClndrDirective = -> $scope.$watch () -> return JSON.stringify($scope.events || {}) , (val) -> - $scope.clndr.setEvents(angular.copy(val || [])) + $scope.clndr.setEvents(angular.copy($scope.events || [])) # extend all CLNDR data to scope render = (data) ->