Merge branch 'release/0.3.12'

Author: dalelotts

.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "bower_components"
+  "directory": "bower_components"
 }

.npmignore

@@ -0,0 +1,15 @@
+.gitignore
+.idea
+.jshintignore
+.jshintrc
+.travis.yml
+angular-bootstrap-datetimepicker.iml
+bower_components
+complexity
+coverage
+demo
+Gruntfile.js
+gulpfile.js
+karma.conf.js
+paths.js
+test

.travis.yml

@@ -7,10 +7,6 @@ branches:
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
-before_script:
-- npm install -g bower grunt-cli
-- bower install
-script: grunt --verbose
 deploy:
   provider: npm
   email: dale@dalelotts.com

Gruntfile.js

@@ -1,24 +1,11 @@
-/*globals module, require, process */
+/*globals module, require */
 /*jslint vars:true */
 module.exports = function (grunt) {
   'use strict';
 
   // load all grunt tasks
   require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
 
-  // Default task.
-  grunt.registerTask('default', ['jshint', 'complexity', 'karma', 'coverage']);
-
-  var testConfig = function (configFile, customOptions) {
-    var options = {configFile: configFile, keepalive: true};
-    var travisOptions = process.env.TRAVIS && {
-        browsers: ['Firefox'],
-        reporters: ['dots', 'coverage'],
-        singleRun: true
-      };
-    return grunt.util._.extend(options, customOptions, travisOptions);
-  };
-
   // Project configuration.
   grunt.initConfig({
     bump: {
@@ -30,56 +17,6 @@ module.exports = function (grunt) {
         push: false,
         globalReplace: false
       }
-    },
-    complexity: {
-      generic: {
-        src: ['src/**/*.js'],
-        options: {
-          breakOnErrors: false,
-          jsLintXML: 'complexity/report.xml',   // create XML JSLint-like report
-          errorsOnly: false,                    // show only maintainability errors
-          cyclomatic: [3, 7, 12],               // or optionally a single value, like 3
-          halstead: [8, 13, 20],                // or optionally a single value, like 8
-          maintainability: 100
-        }
-      }
-    },
-    coverage: {
-      options: {
-        thresholds: {
-          'statements': 100,
-          'branches': 96.9,
-          'lines': 100,
-          'functions': 100
-        },
-        dir: 'coverage',
-        root: ''
-      }
-    },
-    karma: {
-      unit: {
-        options: testConfig('karma.conf.js', {
-          singleRun: true,
-          autoWatch: true,
-          keepalive: true,
-          browsers: ['Chrome']
-        })
-      }
-    },
-    jshint: {
-      files: ['src/**/*.js', 'test/**/*.js', 'demo/**/*.js'],
-      options: {
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        boss: true,
-        eqnull: true,
-        globals: {}
-      }
     }
   });
 };

README.md

@@ -1,13 +1,16 @@
-# Angular bootstrap date & time picker version: 0.3.11
+# Angular bootstrap date & time picker version: 0.3.12
 ================================
 
 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)
 [![devDependency Status](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker/dev-status.png)](https://david-dm.org/dalelotts/angular-bootstrap-datetimepicker#info=devDependencies)
-[![Code Climate](https://codeclimate.com/github/dalelotts/angular-bootstrap-datetimepicker.png)](https://codeclimate.com/github/dalelotts/angular-bootstrap-datetimepicker)
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/dalelotts/angular-bootstrap-datetimepicker/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![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">
+  <img src="http://jpillora.com/github-twitter-button/img/tweet.png"></img>
+</a>
+
 
 [Home / demo page](http://dalelotts.github.io/angular-bootstrap-datetimepicker/)
 
@@ -44,14 +47,15 @@ optional:
  * bootstrap's dropdown component (`dropdowns.less`)
 
 #Testing
-We use karma and jshint to ensure the quality of the code. The easiest way to run these checks is to use grunt:
+We use karma and jshint to ensure the quality of the code. The easiest way to run these checks is to use gulp:
 
 ```
-npm install -g grunt-cli
 npm install
+npm test
 ```
 
-The karma task will try to open Chrome as a browser in which to run the tests. Make sure this is available or change the configuration in test\test.config.js
+The karma task will try to open Chrome as a browser in which to run the tests.
+Make sure Chrome is available or change the browsers setting in karma.config.js
 
 #Usage
 We use bower for dependency management. Add

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "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",
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "angular": "~1.3.14",
-    "moment": "^2.8.4"
+    "moment": "^2.9.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.3.14",

gulpfile.js

@@ -5,43 +5,49 @@
 var gulp = require('gulp');
 var jshint = require('gulp-jshint');
 var karma = require('karma').server;
-var bump = require('gulp-bump');
+var lodash = require('lodash');
 var plato = require('gulp-plato');
 var karmaConfig = __dirname + '/karma.conf.js';
 var paths = require('./paths');
 
-
-gulp.task('bump', function () {
-  return gulp.src(paths.bump)
-    .pipe(bump())
-    .pipe(gulp.dest('./'));
-});
-
 gulp.task('complexity', function () {
   return gulp.src('src/**/*.js')
     .pipe(plato('complexity'));
 });
 
+var testConfig = function (options) {
+  var travisOptions = process.env.TRAVIS &&
+    {
+      browsers: ['Firefox'],
+      reporters: ['dots', 'coverage', 'threshold']
+    };
+
+  return lodash.assign(options, travisOptions);
+};
+
 gulp.task('test', function (done) {
-  karma.start({
-    configFile: karmaConfig,
-    singleRun: true,
-    reporters: ['progress', 'coverage', 'threshold']
-  }, done);
+  karma.start(testConfig(
+    {
+      configFile: karmaConfig,
+      singleRun: true,
+      reporters: ['progress', 'coverage', 'threshold']
+    }
+  ), done);
 });
 
 gulp.task('tdd', function (done) {
   gulp.watch(paths.all, ['lint']);
 
   karma.start({
-    configFile: paths.karmaConfig
+    configFile: karmaConfig
   }, done);
 });
 
 gulp.task('lint', function () {
   return gulp
     .src(paths.lint)
-    .pipe(jshint())
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default', {verbose: true}))
     .pipe(jshint.reporter('jshint-stylish'))
     .pipe(jshint.reporter('fail'));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "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": {
@@ -9,35 +9,35 @@
   "license": "MIT",
   "homepage": "http://dalelotts.github.io/angular-bootstrap-datetimepicker",
   "main": "src/js/datetimepicker.js",
-  "dependencies": {},
-  "devDependencies": {
+  "dependencies": {
+    "angular": "^1.3.14",
     "bower": "latest",
+    "moment": "^2.9.0"
+  },
+  "devDependencies": {
     "grunt": "^0.4.4",
-    "grunt-bump": "0.0.16",
-    "grunt-complexity": "^0.2.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-istanbul-coverage": "^0.1.0",
-    "grunt-karma": "^0.9.0",
+    "grunt-bump": "^0.3.0",
     "gulp": "^3.8.11",
-    "gulp-bump": "^0.1.11",
-    "gulp-jshint": "^1.9.0",
-    "gulp-plato": "^1.0.1",
-    "jshint-stylish": "^1.0.0",
-    "karma": "^0.12.25",
+    "gulp-jshint": "^1.9.4",
+    "gulp-plato": "^1.0.2",
+    "jshint": "^2.6.0",
+    "jshint-stylish": "^1.0.1",
+    "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.5",
     "karma-coverage": "^0.2.1",
     "karma-firefox-launcher": "^0.1.3",
     "karma-jasmine": "^0.3.2",
     "karma-phantomjs-launcher": "^0.1.2",
     "karma-threshold-reporter": "^0.1.12",
+    "lodash": "^3.5.0",
     "matchdep": "^0.3.0",
-    "phantomjs": "^1.9.12"
-  },
-  "peerDependencies": {
-    "grunt-cli": "0.1.13"
+    "phantomjs": "^1.9.12",
+    "run-browser": "^2.0.2",
+    "tape": "^3.5.0"
   },
   "scripts": {
-    "test": "grunt --verbose",
+    "test": "npm run test-browserify && gulp",
+    "test-browserify": "run-browser test/commonjs/browserify.test.js -b",
     "postinstall": "./node_modules/bower/bin/bower install"
   },
   "repository": {

paths.js

@@ -9,14 +9,14 @@ var bower = [
   'bower_components/angular-mocks/angular-mocks.js'
 ];
 var sourceFiles = ['src/**/*.js'];
-var testFiles = ['test/**/*.js'];
-var miscFiles = ['karma.conf.js', 'demo/**/*.js'];
+var testFiles = ['test/**/*.spec.js'];
+var miscFiles = ['demo/**/*.js'];
 var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js', 'src/css/*.css'];
 
 module.exports = {
   all: bower.concat(sourceFiles).concat(testFiles).concat(miscFiles),
   app: sourceFiles,
   bump: bumpFiles,
-  lint: ['gulpfile.js'].concat(sourceFiles).concat(testFiles).concat(miscFiles),
+  lint: ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js', 'test/**/*.test.js'].concat(sourceFiles).concat(testFiles).concat(miscFiles),
   test: testFiles
 };

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.11
+ * @license angular-bootstrap-datetimepicker  version: 0.3.12
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */

src/js/datetimepicker.js

@@ -1,8 +1,8 @@
-/*globals define, jQuery */
+/*globals define, jQuery, module, require */
 /*jslint vars:true */
 
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.11
+ * @license angular-bootstrap-datetimepicker  version: 0.3.12
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
@@ -18,6 +18,9 @@
   /* istanbul ignore if */
   if (typeof define === 'function' && /* istanbul ignore next */ define.amd) {
     define(['angular', 'moment'], factory); // AMD
+    /* istanbul ignore next */
+  } else if (typeof exports === 'object') {
+    module.exports = factory(require('angular'), require('moment')); // CommonJS
   } else {
     factory(window.angular, window.moment); // Browser global
   }
@@ -169,7 +172,10 @@
               var result = {
                 'currentView': 'year',
                 'nextView': configuration.minView === 'year' ? 'setTime' : 'month',
-                'previousViewDate': new DateObject({utcDateValue: null, display: startDecade + '-' + (startDecade + 9)}),
+                'previousViewDate': new DateObject({
+                  utcDateValue: null,
+                  display: startDecade + '-' + (startDecade + 9)
+                }),
                 'leftDate': new DateObject({utcDateValue: moment.utc(startDate).subtract(9, 'year').valueOf()}),
                 'rightDate': new DateObject({utcDateValue: moment.utc(startDate).add(11, 'year').valueOf()}),
                 'dates': []

test/commonjs/browserify.test.js

@@ -0,0 +1,19 @@
+/*globals  require */
+
+/** This file is intentionally named browserify.test.js so that it is not picked up by the karma runner **/
+
+var angular = require('angular');
+var tapeTest = require('tape');
+
+tapeTest('can load module after requiring', function (t) {
+  'use strict';
+
+  function loadModule() {
+    angular.module('ui.bootstrap.datetimepicker');
+  }
+
+  t.throws(loadModule);
+  require('../../');
+  t.doesNotThrow(loadModule);
+  t.end();
+});