ax5core copy to assets

ax5ui · Jan 25, 2016 · d419f8c · d419f8c
1 parent 21b4bac
commit d419f8c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,17 @@ exactly the path.
 ### Basic Usages
 ```js
 var myCalendar = new ax5.ui.calendar();
-myCalendar.setConfig();
+myCalendar.setConfig({
+    target: document.getElementById("calendar-target"),
+    displayDate: (new Date()),
+    onClick: function () {
+        console.log(this);
+        console.log(myCalendar.getSelection());
+    },
+    onStateChanged: function () {
+        console.log(this);
+    }
+});
 ```
 
 - - -

diff --git a/dist/ax5calendar.css b/dist/ax5calendar.css
diff --git a/dist/ax5calendar.js b/dist/ax5calendar.js
@@ -257,7 +257,7 @@
                             }
 
                         })() + ' ' + (function () {
-                            return ""; //( U.date(loopDate, {"return":"yyyymmdd"}) == U.date(cfg.displayDate, {"return":"yyyymmdd"}) ) ? "hover" : "";
+                            return ""; 
                         })() + '" data-calendar-item-date="' + U.date(loopDate, {"return": cfg.dateFormat}) + '"><span class="addon"></span>'
                         + cfg.lang.day.replace('%s', loopDate.getDate())
                         + '<span class="lunar"></span></a>');
@@ -493,16 +493,18 @@
 
                 if (selectable) {
                     selectableCount = (cfg.multipleSelect) ? (U.isNumber(cfg.multipleSelect)) ? cfg.multipleSelect : 2 : 1;
+
+                    console.log(selectableCount);
+
                     if (self.selection.length >= selectableCount) {
                         var removed = self.selection.splice(0, self.selection.length - (selectableCount - 1));
                         removed.forEach(function (d) {
-                            self.$["body"].find('[data-calendar-item-date="' + U.date(d, {"return": cfg.dateFormat}) + '"]').removeClass("selected");
+                            self.$["body"].find('[data-calendar-item-date="' + U.date(d, {"return": cfg.dateFormat}) + '"]').removeClass("selected-day");
                         });
                     }
 
-                    jQuery(target).addClass("selected");
+                    jQuery(target).addClass("selected-day");
                     self.selection.push(value);
-                    // cfg.displayDate = value;
 
                     if (cfg.onClick)
                     {

diff --git a/dist/ax5calendar.min.js b/dist/ax5calendar.min.js
diff --git a/src/ax5calendar.js b/src/ax5calendar.js
@@ -257,7 +257,7 @@
                             }
 
                         })() + ' ' + (function () {
-                            return ""; //( U.date(loopDate, {"return":"yyyymmdd"}) == U.date(cfg.displayDate, {"return":"yyyymmdd"}) ) ? "hover" : "";
+                            return ""; 
                         })() + '" data-calendar-item-date="' + U.date(loopDate, {"return": cfg.dateFormat}) + '"><span class="addon"></span>'
                         + cfg.lang.day.replace('%s', loopDate.getDate())
                         + '<span class="lunar"></span></a>');
@@ -493,16 +493,18 @@
 
                 if (selectable) {
                     selectableCount = (cfg.multipleSelect) ? (U.isNumber(cfg.multipleSelect)) ? cfg.multipleSelect : 2 : 1;
+
+                    console.log(selectableCount);
+
                     if (self.selection.length >= selectableCount) {
                         var removed = self.selection.splice(0, self.selection.length - (selectableCount - 1));
                         removed.forEach(function (d) {
-                            self.$["body"].find('[data-calendar-item-date="' + U.date(d, {"return": cfg.dateFormat}) + '"]').removeClass("selected");
+                            self.$["body"].find('[data-calendar-item-date="' + U.date(d, {"return": cfg.dateFormat}) + '"]').removeClass("selected-day");
                         });
                     }
 
-                    jQuery(target).addClass("selected");
+                    jQuery(target).addClass("selected-day");
                     self.selection.push(value);
-                    // cfg.displayDate = value;
 
                     if (cfg.onClick)
                     {

diff --git a/src/scss/_ax5calendar.scss b/src/scss/_ax5calendar.scss
@@ -181,7 +181,7 @@
 								}
 							}
 						}
-						&.selected {
+						&.selected-day {
 							@include ax-background($ax5calendar-hover-bg);
 							color: $ax5calendar-hover-text-color !important;
 							span.addon {

diff --git a/test/index.html b/test/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+<head>ㅔ목
     <meta charset="UTF-8">
     <title>Title</title>
     <link rel="stylesheet" type="text/css" href="../dist/ax5calendar.css"/>
@@ -69,7 +69,7 @@
             onStateChanged: function () {
                 console.log(this);
             }
-            //multipleSelect: 1
+            //, multipleSelect: 1
         });
 
         myCalendar.setSelection(['2016-01-11', '2016-01-12', '2016-01-13']);