Merge branch 'release/0.3.14'

Author: dalelotts

.csslintrc

@@ -0,0 +1,3 @@
+{
+	"adjoining-classes": false
+}

.jscsrc

@@ -1,7 +1,8 @@
 {
-  "preset": "crockford",
   "disallowDanglingUnderscores": { "allExcept": ["_$compile_", "_$rootScope_"] },
   "disallowMultipleVarDecl": "strict",
-  "validateIndentation": 2,
-  "requireMultipleVarDecl": null
-}
+  "preset": "crockford",
+  "requireMultipleVarDecl": null,
+  "requireVarDeclFirst": null,
+  "validateIndentation": 2
+}

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+sudo: false
 node_js:
 - '0.12'
 branches:

README.md

@@ -1,10 +1,10 @@
-# Angular bootstrap date & time picker version: 0.3.13
-================================
+# Angular bootstrap date & time picker version: 0.3.14
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3
 
 [![MIT License][license-image]][license-url]
 [![Build Status](https://travis-ci.org/dalelotts/angular-bootstrap-datetimepicker.png?branch=master)](https://travis-ci.org/dalelotts/angular-bootstrap-datetimepicker)
+[![Dependency Status](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker.svg)](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker)
 [![devDependency Status](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker/dev-status.png)](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker#info=devDependencies)
 [![PayPal donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=F3FX5W6S2U4BW&lc=US&item_name=Dale%20Lotts&item_number=angular%2dbootstrap%2ddatetimepicker&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted "Donate one-time to this project using Paypal")
 <a href="https://twitter.com/intent/tweet?original_referer=https%3A%2F%2Fabout.twitter.com%2Fresources%2Fbuttons&amp;text=Check%20out%20this%20%23AngularJS%20directive%20that%20makes%20it%20dead%20simple%20for%20users%20to%20select%20dates%20%26%20times&amp;tw_p=tweetbutton&amp;url=https%3A%2F%2Fgithub.com%2Fdalelotts%2Fangular-bootstrap-datetimepicker&amp;via=dalelotts" target="_blank">
@@ -14,27 +14,6 @@ Native AngularJS datetime picker directive styled by Twitter Bootstrap 3
 
 [Home / demo page](http://dalelotts.github.io/angular-bootstrap-datetimepicker/)
 
-# Upgrading to 0.3.x
-
-<code>weekStart</code> has been removed. This directive uses the locale aware 
-[moment.js day of week](http://momentjs.com/docs/#/get-set/weekday/) to
-determine which day is the first day of the week. If you would like a first 
-day of week that is not standard for the locale you can create a 
-[custom locale](http://momentjs.com/docs/#/customization/) 
-
-## Easier to control width
-
-The width of the entire control is set in css, which you can easily override.
-
-## Better localization support
-
-This directive uses localized date formats when available. One exception is the title
-of the month view - moment does not (yet) have a localized format for month and year.
-
-# (Almost) Complete re-write
-
-This project started as an AngularJS specific re-write of the [bootstrap-datetimepicker project](https://github.com/smalot/bootstrap-datetimepicker).
-Only the CSS file from the bootstrap-datetimepicker project was re-used.
 
 #Dependencies
 
@@ -47,6 +26,8 @@ optional:
  * bootstrap's dropdown component (`dropdowns.less`)
 
 #Testing
+This directive was written using TDD and all enhancements and changes have related tests.
+
 We use karma and jshint to ensure the quality of the code. The easiest way to run these checks is to use gulp:
 
 ```
@@ -164,6 +145,12 @@ data-on-set-time="onTimeSet"    <-- **This will NOT work, the ()'s are required*
 
 
 ## Configuration Options
+***NOTE*** The configuration optionss are not attributes on the element but rather members of the configuration object,
+which is specified in the data-datetimepicker-config attribute.
+
+```html
+<datetimepicker data-ng-model="data.date" data-datetimepicker-config="{ dropdownSelector: '.dropdown-toggle' }"></datetimepicker>
+```
 
 ### startView
 
@@ -262,11 +249,19 @@ In this example, the drop-down functionality is controlled by Twitter Bootstrap.
 The <code>dropdownSelector</code> tells the datetimepicker which element is bound to the Twitter Bootstrap drop-down so
 the drop-down is toggled closed after the user selectes a date/time.
 
-## I18N
+
+## I18N / l10n support
 
 All internationalization is handled by Moment.js, see Moment's documentation for details.
 In most cases, all that is needed is a call to ```moment.locale(String)```
 
+One exception is the title of the month view - moment does not (yet) have a localized format for month and year.
+
+```JavaScript
+moment.locale('en');        // English
+moment.locale('zh-cn');     // Simplified chinese
+```
+
 # Screenshots
 
 ## Year view
@@ -305,6 +300,9 @@ This view allows the user to select a specific time of day, in the selected hour
 By default, the time is displayed in 5 minute increments. The <code>minuteStep</code> property controls the increments of time displayed.
 If the minute view is the minView, which is is by default, the date will be set to the beginning of the hour on the day selected.
 
+##Contributing
+
+
 ## License
 
 angular-bootstrap-datetimepicker is freely distributable under the terms of the [MIT license](LICENSE).

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "This directive allows you to add a datetime-picker to your form.",
   "author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",
@@ -23,12 +23,12 @@
     "test*"
   ],
   "dependencies": {
-    "angular": "~1.3.14",
-    "moment": "^2.9.0"
+    "angular": "^1.4.7",
+    "moment": "^2.10.6"
   },
   "devDependencies": {
-    "angular-mocks": "~1.3.14",
-    "bootstrap": "^3.3.1",
-    "jquery": "^2.1.3"
+    "angular-mocks": "^1.4.7",
+    "bootstrap": "^3.3.5",
+    "jquery": "^2.1.4"
   }
 }

demo/index.html

@@ -31,14 +31,14 @@
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
     <meta name="theme-color" content="#ffffff">
 
-    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
+    <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.css">
     <link rel="stylesheet" href="src/css/datetimepicker.css">
-    <script type="text/javascript" src="bower_components/jquery/dist/jquery.js"></script>
-    <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
-    <script type="text/javascript" src="bower_components/angular/angular.js"></script>
-    <script type="text/javascript" src="bower_components/moment/moment.js"></script>
-    <script type="text/javascript" src="bower_components/moment/locale/de.js"></script>
-    <script type="text/javascript" src="bower_components/moment/locale/zh-cn.js"></script>
+    <script type="text/javascript" src="node_modules/jquery/dist/jquery.js"></script>
+    <script type="text/javascript" src="node_modules/bootstrap/dist/js/bootstrap.js"></script>
+    <script type="text/javascript" src="node_modules/angular/angular.js"></script>
+    <script type="text/javascript" src="node_modules/moment/moment.js"></script>
+    <script type="text/javascript" src="node_modules/moment/locale/de.js"></script>
+    <script type="text/javascript" src="node_modules/moment/locale/zh-cn.js"></script>
     <script type="text/javascript" src="demo/demo-app.js"></script>
     <script type="text/javascript" src="demo/demo-controller.js"></script>
     <script type="text/javascript" src="src/js/datetimepicker.js"></script>

gulpfile.js

@@ -2,14 +2,15 @@
 /* jshint node:true */
 'use strict';
 
+var csslint = require('gulp-csslint');
 var gulp = require('gulp');
 var jscs = require('gulp-jscs');
 var jshint = require('gulp-jshint');
-var karma = require('karma').server;
 var karmaConfig = __dirname + '/karma.conf.js';
 var lodash = require('lodash');
 var paths = require('./paths');
 var plato = require('plato');
+var Server = require('karma').Server;
 
 gulp.task('complexity', function (done) {
 
@@ -20,6 +21,14 @@ gulp.task('complexity', function (done) {
   plato.inspect(paths.lint, 'complexity', {title: 'prerender', recurse: true}, callback);
 });
 
+
+gulp.task('csslint', function () {
+  return gulp.src(paths.css)
+    .pipe(csslint())
+    .pipe(csslint.reporter())
+    .pipe(csslint.failReporter());
+});
+
 var testConfig = function (options) {
   var travisOptions = process.env.TRAVIS &&
     {
@@ -31,21 +40,33 @@ var testConfig = function (options) {
 };
 
 gulp.task('test', function (done) {
-  karma.start(testConfig(
+
+  var config = testConfig(
     {
       configFile: karmaConfig,
       singleRun: true,
       reporters: ['progress', 'coverage', 'threshold']
     }
-  ), done);
+  );
+
+  var server = new Server(config, done);
+  server.start();
 });
 
 gulp.task('tdd', function (done) {
-  gulp.watch(paths.all, ['lint']);
+  gulp.watch(paths.all, ['jscs', 'lint', 'csslint']);
+
+  var config = testConfig(
+    {
+      autoWatch: true,
+      browsers: ['PhantomJS'],
+      configFile: karmaConfig,
+      singleRun: false
+    }
+  );
 
-  karma.start({
-    configFile: karmaConfig
-  }, done);
+  var server = new Server(config, done);
+  server.start();
 });
 
 gulp.task('lint', function () {
@@ -63,4 +84,4 @@ gulp.task('jscs', function () {
     .pipe(jscs('.jscsrc'));
 });
 
-gulp.task('default', ['jscs', 'lint', 'complexity', 'test']);
+gulp.task('default', ['jscs', 'lint', 'csslint', 'complexity', 'test']);

karma.conf.js

@@ -56,7 +56,7 @@ module.exports = function (config) {
     // the configure thresholds
     thresholdReporter: {
       statements: 100,
-      branches: 96.9,
+      branches: 97,
       functions: 100,
       lines: 100
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "bugs": {
@@ -10,36 +10,40 @@
   "homepage": "http://dalelotts.github.io/angular-bootstrap-datetimepicker",
   "main": "src/js/datetimepicker.js",
   "dependencies": {
-    "angular": "^1.3.14",
-    "bower": "latest",
-    "moment": "^2.9.0"
+    "angular": "^1.4.7",
+    "moment": "^2.10.6"
   },
   "devDependencies": {
+    "angular-mocks": "^1.4.7",
+    "bootstrap": "^3.3.5",
+    "bower": "latest",
+    "csslint": "^0.10.0",
     "grunt": "^0.4.4",
-    "grunt-bump": "^0.3.0",
+    "grunt-bump": "^0.6.0",
     "gulp": "^3.8.11",
-    "gulp-jscs": "^1.4.0",
-    "gulp-jshint": "^1.9.4",
+    "gulp-csslint": "^0.2.0",
+    "gulp-jscs": "^3.0.0",
+    "gulp-jshint": "^1.11.2",
+    "jquery": "^2.1.4",
     "jshint": "^2.6.0",
-    "jshint-stylish": "^1.0.1",
-    "karma": "^0.12.31",
-    "karma-chrome-launcher": "^0.1.5",
-    "karma-coverage": "^0.2.1",
+    "jshint-stylish": "^2.0.1",
+    "karma": "^0.13.10",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-coverage": "^0.5.0",
     "karma-firefox-launcher": "^0.1.3",
-    "karma-jasmine": "^0.3.2",
-    "karma-phantomjs-launcher": "^0.1.2",
+    "karma-jasmine": "^0.3.6",
+    "karma-phantomjs-launcher": "^0.2.1",
     "karma-threshold-reporter": "^0.1.12",
-    "lodash": "^3.5.0",
-    "matchdep": "^0.3.0",
-    "phantomjs": "^1.9.12",
+    "lodash": "^3.10.1",
+    "matchdep": "^1.0.0",
+    "phantomjs": "^1.9.18",
     "plato": "^1.5.0",
     "run-browser": "^2.0.2",
-    "tape": "^3.5.0"
+    "tape": "^4.2.0"
   },
   "scripts": {
     "test": "npm run test-browserify && gulp",
-    "test-browserify": "run-browser test/commonjs/browserify.test.js -b",
-    "postinstall": "./node_modules/bower/bin/bower install"
+    "test-browserify": "run-browser test/commonjs/browserify.test.js -b"
   },
   "repository": {
     "type": "git",

paths.js

@@ -1,23 +1,25 @@
 /* jshint node:true */
 
-var bower = [
-  'bower_components/jquery/dist/jquery.js',
-  'bower_components/moment/moment.js',
-  'bower_components/moment/locale/*.js',
-  'bower_components/bootstrap/dist/js/bootstrap.js',
-  'bower_components/angular/angular.js',
-  'bower_components/angular-mocks/angular-mocks.js'
+var modules = [
+  'node_modules/jquery/dist/jquery.js',
+  'node_modules/moment/moment.js',
+  'node_modules/moment/locale/*.js',
+  'node_modules/bootstrap/dist/js/bootstrap.js',
+  'node_modules/angular/angular.js',
+  'node_modules/angular-mocks/angular-mocks.js'
 ];
-var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js', 'src/css/*.css'];
-var miscFiles = ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js'];
+var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js'];
+var cssFiles = ['src/css/*.css'];
 var demoFiles = ['demo/**/*.js'];
+var miscFiles = ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js'];
 var sourceFiles = ['src/**/*.js'];
 var testFiles = ['test/**/*.spec.js'];
 
 module.exports = {
-  all: bower.concat(sourceFiles).concat(testFiles).concat(demoFiles),
+  all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles),
   app: sourceFiles,
-  bump: bumpFiles,
+  bump: bumpFiles.concat(cssFiles),
+  css: cssFiles,
   lint: miscFiles.concat(sourceFiles).concat(testFiles).concat(miscFiles),
   src: sourceFiles,
   test: testFiles