Merge branch 'release/0.3.15'

Author: dalelotts

.csscomb.json

@@ -0,0 +1,26 @@
+{
+  "remove-empty-rulesets": true,
+  "always-semicolon": true,
+  "color-case": "lower",
+  "block-indent": "  ",
+  "color-shorthand": false,
+  "element-case": "lower",
+  "eof-newline": true,
+  "leading-zero": true,
+  "quotes": "single",
+  "sort-order-fallback": "abc",
+  "space-before-colon": "",
+  "space-after-colon": " ",
+  "space-before-combinator": " ",
+  "space-after-combinator": " ",
+  "space-between-declarations": "\n",
+  "space-before-opening-brace": " ",
+  "space-after-opening-brace": "\n",
+  "space-after-selector-delimiter": "\n",
+  "space-before-selector-delimiter": "",
+  "space-before-closing-brace": "\n",
+  "strip-spaces": true,
+  "tab-size": true,
+  "unitless-zero": true,
+  "vendor-prefix-align": true
+}

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-- '0.12'
+- '4.1'
 branches:
   except:
   - gh-pages

Gruntfile.js

@@ -6,11 +6,13 @@ module.exports = function (grunt) {
   // load all grunt tasks
   require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
 
+  var paths = require('./paths');
+
   // Project configuration.
   grunt.initConfig({
     bump: {
       options: {
-        files: ['package.json', 'bower.json', 'README.md', 'src/js/*.js', 'src/css/*.css'],
+        files: paths.bump,
         updateConfigs: [],
         commit: false,
         createTag: false,

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker version: 0.3.14
+# Angular bootstrap date & time picker version: 0.3.15
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3
 
@@ -305,7 +305,34 @@ If the minute view is the minView, which is is by default, the date will be set
 
 ## License
 
-angular-bootstrap-datetimepicker is freely distributable under the terms of the [MIT license](LICENSE).
+angular-bootstrap-datetimepicker is released under the MIT license and is copyright 2015 Knight Rider Consulting, Inc.. Boiled down to smaller chunks, it can be described with the following conditions.
+
+## It requires you to:
+
+* Keep the license and copyright notice included in angular-bootstrap-datetimepicker's CSS and JavaScript files when you use them in your works
+
+## It permits you to:
+
+* Freely download and use angular-bootstrap-datetimepicker, in whole or in part, for personal, private, company internal, or commercial purposes
+* Use angular-bootstrap-datetimepicker in packages or distributions that you create
+* Modify the source code
+* Grant a sublicense to modify and distribute angular-bootstrap-datetimepicker to third parties not included in the license
+
+## It forbids you to:
+
+* Hold the authors and license owners liable for damages as angular-bootstrap-datetimepicker is provided without warranty
+* Hold the creators or copyright holders of angular-bootstrap-datetimepicker liable
+* Redistribute any piece of angular-bootstrap-datetimepicker without proper attribution
+* Use any marks owned by Knight Rider Consulting, Inc. in any way that might state or imply that Knight Rider Consulting, Inc. endorses your distribution
+* Use any marks owned by Knight Rider Consulting, Inc. in any way that might state or imply that you created the Knight Rider Consulting, Inc. software in question
+
+## It does not require you to:
+
+* Include the source of angular-bootstrap-datetimepicker itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it
+* Submit changes that you make to angular-bootstrap-datetimepicker back to the angular-bootstrap-datetimepicker project (though such feedback is encouraged)
+
+The full angular-bootstrap-datetimepicker license is located [in the project repository](https://github.com/dalelotts/angular-bootstrap-datetimepicker/blob/master/LICENSE) for more information.
+
 
 ## Donating
 Support this project and other work by Dale Lotts via [gittip][gittip-dalelotts].

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "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",

demo/demo-controller.js

@@ -55,7 +55,7 @@ angular.module('demo.demoController', [])
       };
 
       $scope.beforeRender = function ($dates) {
-        var index = Math.floor(Math.random() * $dates.length);
+        var index = Math.ceil($dates.length / 2);
         $log.info(index);
         $dates[index].selectable = false;
       };

demo/index.html

@@ -326,7 +326,7 @@ <h3>ng-repeat with drop-down using text link</h3>
 
     <div class="col-sm-6">
         <h3>Drop-down Datetime with restricted dates</h3>
-        <h4>One date is randomly disabled on each view</h4>
+        <h4>One date - somewhere near the middle of the display - is disabled on each view</h4>
 
         <p><code>dropdownSelector: '#dropdown6'</code> to toggle the dropdown.</p>
 

gulpfile.js

@@ -12,6 +12,13 @@ var paths = require('./paths');
 var plato = require('plato');
 var Server = require('karma').Server;
 
+gulp.task('build-css', ['scss'], function () {
+  var Comb = require('csscomb');
+  var config = require('./.csscomb.json');
+  var comb = new Comb(config);
+  comb.processPath('./src/css/');
+});
+
 gulp.task('complexity', function (done) {
 
   var callback = function () {
@@ -29,6 +36,43 @@ gulp.task('csslint', function () {
     .pipe(csslint.failReporter());
 });
 
+gulp.task('jscs', function () {
+  return gulp
+    .src(paths.lint)
+    .pipe(jscs('.jscsrc'));
+});
+
+gulp.task('lint', function () {
+  return gulp
+    .src(paths.lint)
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default', {verbose: true}))
+    .pipe(jshint.reporter('jshint-stylish'))
+    .pipe(jshint.reporter('fail'));
+});
+
+
+gulp.task('scss', ['scss-lint'], function () {
+  var scss = require('gulp-sass');
+  var postcss = require('gulp-postcss');
+  var sourcemaps = require('gulp-sourcemaps');
+  var autoprefixer = require('autoprefixer');
+
+  return gulp.src(paths.scss)
+    .pipe(scss())
+    .pipe(sourcemaps.init())
+    .pipe(postcss([autoprefixer({browsers: ['last 2 versions']})]))
+    .pipe(sourcemaps.write('.'))
+    .pipe(gulp.dest('./src/css'));
+});
+
+gulp.task('scss-lint', function () {
+  var scssLint = require('gulp-scss-lint');
+  var scssLintStylish = require('gulp-scss-lint-stylish');
+  return gulp.src('./src/scss/*.scss')
+    .pipe(scssLint({customReport: scssLintStylish}));
+});
+
 var testConfig = function (options) {
   var travisOptions = process.env.TRAVIS &&
     {
@@ -39,49 +83,36 @@ var testConfig = function (options) {
   return lodash.assign(options, travisOptions);
 };
 
-gulp.task('test', function (done) {
+gulp.task('tdd', function (done) {
+  gulp.watch(paths.all.concat(paths.scss), ['jscs', 'lint', 'build-css']);
 
   var config = testConfig(
     {
+      autoWatch: true,
+      browsers: ['PhantomJS'],
       configFile: karmaConfig,
-      singleRun: true,
-      reporters: ['progress', 'coverage', 'threshold']
+      singleRun: false
     }
   );
 
   var server = new Server(config, done);
   server.start();
 });
 
-gulp.task('tdd', function (done) {
-  gulp.watch(paths.all, ['jscs', 'lint', 'csslint']);
+
+gulp.task('test', function (done) {
 
   var config = testConfig(
     {
-      autoWatch: true,
-      browsers: ['PhantomJS'],
       configFile: karmaConfig,
-      singleRun: false
+      singleRun: true,
+      reporters: ['progress', 'coverage', 'threshold']
     }
   );
 
   var server = new Server(config, done);
   server.start();
 });
 
-gulp.task('lint', function () {
-  return gulp
-    .src(paths.lint)
-    .pipe(jshint('.jshintrc'))
-    .pipe(jshint.reporter('default', {verbose: true}))
-    .pipe(jshint.reporter('jshint-stylish'))
-    .pipe(jshint.reporter('fail'));
-});
-
-gulp.task('jscs', function () {
-  return gulp
-    .src(paths.lint)
-    .pipe(jscs('.jscsrc'));
-});
 
-gulp.task('default', ['jscs', 'lint', 'csslint', 'complexity', 'test']);
+gulp.task('default', ['jscs', 'lint', 'complexity', 'csslint', 'test']);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "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": {
@@ -15,15 +15,22 @@
   },
   "devDependencies": {
     "angular-mocks": "^1.4.7",
+    "autoprefixer": "^6.0.3",
     "bootstrap": "^3.3.5",
     "bower": "latest",
+    "csscomb": "^3.1.8",
     "csslint": "^0.10.0",
     "grunt": "^0.4.4",
     "grunt-bump": "^0.6.0",
     "gulp": "^3.8.11",
     "gulp-csslint": "^0.2.0",
     "gulp-jscs": "^3.0.0",
     "gulp-jshint": "^1.11.2",
+    "gulp-postcss": "^6.0.1",
+    "gulp-sass": "^2.0.4",
+    "gulp-scss-lint": "^0.3.6",
+    "gulp-scss-lint-stylish": "^1.0.0",
+    "gulp-sourcemaps": "^1.6.0",
     "jquery": "^2.1.4",
     "jshint": "^2.6.0",
     "jshint-stylish": "^2.0.1",

paths.js

@@ -12,15 +12,17 @@ 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 scssFiles = ['src/scss/*.scss'];
 var sourceFiles = ['src/**/*.js'];
 var testFiles = ['test/**/*.spec.js'];
 
 module.exports = {
-  all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles),
+  all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles).concat(cssFiles),
   app: sourceFiles,
-  bump: bumpFiles.concat(cssFiles),
+  bump: bumpFiles.concat(scssFiles).concat(cssFiles),
   css: cssFiles,
   lint: miscFiles.concat(sourceFiles).concat(testFiles).concat(miscFiles),
+  scss: scssFiles,
   src: sourceFiles,
   test: testFiles
 };