Merge branch 'master' into master

Author: g1eb

README.md

@@ -44,17 +44,17 @@ angular.module('myApp', [
 
 3) Use any of the directives in a view
 
-For date input only
+For date input only:
 ```html
 <date-input date="date" on-change="print(date)" placeholder="Select date"></date-input>
 ```
 
-For time input only
+For time input only:
 ```html
 <time-input time="time" on-change="print(time)" placeholder="Select time"></time-input>
 ```
 
-For both date and time input
+For both date and time input:
 ```html
 <datetime-input datetime="datetime" on-change="print(datetime)" placeholder="Select datetime"></datetime-input>
 ```
@@ -68,8 +68,8 @@ For both date and time input
 | datetime | moment.js datetime object or a datetime string | none | no |
 | format | moment.js compatible date/time format | none | no |
 | placeholder | Placeholder is shown when input object is undefined | none | no |
-| cssClass | custom css class name | pre-defined style | no |
 | on-change | Handler function that is fired on change of datetime object | none | no |
+| css-class | custom css class name for datetime presentation | predefined | no |
 
 ## Dependencies
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-datetime-inputs",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "UI elements for datetime input, converted to angular directives for your convenience.",
   "homepage": "https://github.com/g1eb/angular-datetime-inputs",
   "authors": [

dist/datetime-inputs.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-datetime-inputs",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "UI elements for datetime input, converted to angular directives for your convenience.",
   "homepage": "https://github.com/g1eb/angular-datetime-inputs#readme",
   "author": "gleb",

package.json

@@ -14,7 +14,7 @@ directive('dateInput', ['$document', function ($document) {
       placeholder: '@',
       cssClass:'@',
       minDate:'=?',
-      maxDate:'=?'
+      maxDate:'=?',
     },
     replace: true,
     templateUrl: './date-input.html',

src/date-input.js

@@ -1,7 +1,6 @@
 <div class="datetime-input datetime">
-  <div class="{{cssClass || 'display'}}"
-    ng-click="toggleEditPopover()"
-    ng-class="{'active': !!selected }">
+  <div ng-click="toggleEditPopover()"
+    ng-class="{'active': !!selected, 'display': !cssClass, '{{cssClass}}': !!cssClass}">
     <div class="date" ng-bind="datetime.format('DD MMMM YYYY')"></div>
     <div class="time" ng-bind="datetime.format('HH : mm : ss')"></div>
     <div ng-if="!datetime" class="placeholder" ng-bind="placeholder"></div>

src/datetime-input.html

@@ -12,7 +12,7 @@ directive('datetimeInput', ['$document', function ($document) {
       format: '=?',
       onChange: '&',
       placeholder: '@',
-      cssClass:'@'
+      cssClass:'@',
     },
     replace: true,
     templateUrl: './datetime-input.html',

src/datetime-input.js

@@ -1,7 +1,6 @@
 <div class="datetime-input time">
-  <div class="{{cssClass || 'display'}}"
-    ng-click="toggleEditPopover()"
-    ng-class="{'active': !!selected }">
+  <div ng-click="toggleEditPopover()"
+    ng-class="{'active': !!selected, 'display': !cssClass, '{{cssClass}}': !!cssClass}">
     <div class="time" ng-bind="time.format('HH : mm : ss')"></div>
     <div ng-if="!time" class="placeholder" ng-bind="placeholder"></div>
   </div>

src/time-input.html

@@ -12,7 +12,7 @@ directive('timeInput', ['$document', function ($document) {
       format: '=?',
       onChange: '&',
       placeholder: '@',
-      cssClass:'@'
+      cssClass:'@',
     },
     replace: true,
     templateUrl: './time-input.html',