ax5calendar 0.7.0

ax5ui · Feb 4, 2016 · 817b644 · 817b644
1 parent b445a53
commit 817b644
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 9 deletions.
diff --git a/API.md b/API.md
@@ -34,6 +34,7 @@ myCalendar.setConfig({
         dayTmpl: 'String' // %s
     },
     selectable: 'Array|Object',
+    marker: 'Object',
     multipleSelect: 'false|Number', // false
     onClick: "Function", // null
     onStateChanged: "Function" // null
@@ -168,6 +169,18 @@ selectable: { range: [{from: new Date(2016, 0, 1), to: new Date(2016, 0, 2)}] }
 selectable: { '2016-01-01': true, '2016-01-02': true }
 ```
 
+### marker
+
+Type: `Object`
+
+```js
+marker: {
+    '2016-02-07': {theme: 'holiday', label: '설날'},
+    '2016-02-08': {theme: 'holiday', label: '설날'},
+    '2016-02-09': {theme: 'holiday', label: '설날'},
+    '2016-02-10': {theme: 'holiday', label: '대체휴일'}
+}
+```
 
 ### multipleSelect
 
@@ -237,3 +250,16 @@ myCalendar.setSelectable({ range: [{from: new Date(), to: new Date()}] });
 myCalendar.setSelectable({ '2016-01-01': true, '2016-01-02': true });
 ```
 
+- - -
+
+## setMarker()
+`setMarker(marker[, isApply])`
+
+```js
+myCalendar.setMarker({
+    '2016-02-07': {theme: 'holiday', label: '설날'},
+    '2016-02-08': {theme: 'holiday', label: '설날'},
+    '2016-02-09': {theme: 'holiday', label: '설날'},
+    '2016-02-10': {theme: 'holiday', label: '대체휴일'}
+});
+```
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "bootstrap-ax5calendar",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"authors": [
 		"ThomasJ <[email protected]>"
 	],

diff --git a/dist/ax5calendar.js b/dist/ax5calendar.js
@@ -875,7 +875,7 @@
                 }
             };
 
-            return function (marker, isPrint) {
+            return function (marker, isApply) {
 
                 var
                     key,
@@ -896,10 +896,19 @@
 
                 this.markerMap = result;
                 // 변경내용 적용하여 출력
-                if (isPrint !== false) this.changeMode();
+                if (isApply !== false) this.applyMarkerMap();
             };
         })();
 
+        this.applyMarkerMap = function(){
+            if (cfg.mode === "day" || cfg.mode === "d")
+            {
+                for(var k in this.markerMap){
+                    this.$["body"].find('[data-calendar-item-date="'+k+'"]').addClass(this.markerMap[k].theme);
+                }
+            }
+        };
+
         // 클래스 생성자
         this.main = (function () {
             if (arguments && U.isObject(arguments[0])) {

diff --git a/dist/ax5calendar.min.js b/dist/ax5calendar.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bootstrap-ax5calendar",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"description": "A calendar plugin that works with Bootstrap & jQuery",
 	"license": "MIT",
 	"repository": {

diff --git a/src/ax5calendar.js b/src/ax5calendar.js
@@ -875,7 +875,7 @@
                 }
             };
 
-            return function (marker, isPrint) {
+            return function (marker, isApply) {
 
                 var
                     key,
@@ -896,10 +896,19 @@
 
                 this.markerMap = result;
                 // 변경내용 적용하여 출력
-                if (isPrint !== false) this.changeMode();
+                if (isApply !== false) this.applyMarkerMap();
             };
         })();
 
+        this.applyMarkerMap = function(){
+            if (cfg.mode === "day" || cfg.mode === "d")
+            {
+                for(var k in this.markerMap){
+                    this.$["body"].find('[data-calendar-item-date="'+k+'"]').addClass(this.markerMap[k].theme);
+                }
+            }
+        };
+
         // 클래스 생성자
         this.main = (function () {
             if (arguments && U.isObject(arguments[0])) {

diff --git a/test/index.html b/test/index.html
@@ -64,13 +64,14 @@
             selectMode: "day",
 
             // selectable: {range:[{from: '2016-02-01', to: '2016-02-20'}]},
-
+            /*
             marker: {
                 '2016-02-07': {theme: 'holiday', label: '설날'},
                 '2016-02-08': {theme: 'holiday', label: '설날'},
                 '2016-02-09': {theme: 'holiday', label: '설날'},
                 '2016-02-10': {theme: 'holiday', label: '대체휴일'}
             },
+            */
             onClick: function () {
                 console.log(myCalendar.getSelection());
             },
@@ -81,7 +82,14 @@
         });
 
         /// todo : 공휴일 표시에 대한 대안 필요.
-        myCalendar.setSelection(['2016-02-11', '2016-02-12', '2016-02-13']);
+        // myCalendar.setSelection(['2016-02-11', '2016-02-12', '2016-02-13']);
+
+        myCalendar.setMarker({
+            '2016-02-07': {theme: 'holiday', label: '설날'},
+            '2016-02-08': {theme: 'holiday', label: '설날'},
+            '2016-02-09': {theme: 'holiday', label: '설날'},
+            '2016-02-10': {theme: 'holiday', label: '대체휴일'}
+        });
     });
 </script>