Merge pull request g00fy-#124 from astik/fix-dependencies

Fix dependencies
arnostpleskot · Jun 15, 2015 · f09d7f4 · f09d7f4
2 parents 4cdbdc0 + a3c7b7f
commit f09d7f4
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 103 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,7 +1,6 @@
 {
   "node": true,
   "browser": true,
-  "es5": true,
   "esnext": true,
   "bitwise": false,
   "camelcase": true,

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -209,8 +209,6 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.renameTask('regarde', 'watch');
-
   grunt.registerTask('server', [
     'clean:server',
     'recess',

diff --git a/app/index.html b/app/index.html
@@ -6,11 +6,8 @@
   <title></title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">
-  <!-- build:css styles/main.css -->
   <link rel="stylesheet" href="styles/bootstrap.css">
   <link rel="stylesheet" href="styles/style.css"/>
-
-  <!-- endbuild -->
   <link rel="stylesheet" href="../dist/index.css"/>
 </head>
 <body ng-app="sample">
@@ -173,12 +170,10 @@ <h5>Date range button</h5>
 
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.6.0/ui-bootstrap-tpls.min.js"></script>
-<!-- build:js module.min.js -->
 <script src="scripts/datePicker.js"></script>
 <script src="scripts/datePickerUtils.js"></script>
 <script src="scripts/dateRange.js"></script>
 <script src="scripts/input.js"></script>
-<!-- endbuild -->
 <script>
   angular.module('sample', ['datePicker', 'ui.bootstrap']);
 </script>

diff --git a/dist/index.js b/dist/index.js
@@ -1,7 +1,5 @@
 'use strict';
 (function(angular){
-'use strict';
-
 var Module = angular.module('datePicker', []);
 
 Module.constant('datePickerConfig', {
@@ -267,8 +265,6 @@ Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function
   };
 }]);
 
-'use strict';
-
 angular.module('datePicker').factory('datePickerUtils', function(){
   var createNewDate = function(year, month, day, hour, minute) {
     // without any arguments, the default date will be 1899-12-31T00:00:00.000Z
@@ -413,8 +409,6 @@ angular.module('datePicker').factory('datePickerUtils', function(){
     }
   };
 });
-'use strict';
-
 var Module = angular.module('datePicker');
 
 Module.directive('dateRange', function () {
@@ -449,8 +443,6 @@ Module.directive('dateRange', function () {
   };
 });
 
-'use strict';
-
 var PRISTINE_CLASS = 'ng-pristine',
     DIRTY_CLASS = 'ng-dirty';
 
@@ -622,9 +614,8 @@ Module.directive('dateTime', ['$compile', '$document', '$filter', 'dateTimeConfi
   };
 }]);
 
-angular.module("datePicker").run(["$templateCache", function($templateCache) {
-
-  $templateCache.put("templates/datepicker.html",
+angular.module('datePicker').run(['$templateCache', function($templateCache) {
+$templateCache.put('app/templates/datepicker.html',
     "<div ng-switch=\"view\">\n" +
     "  <div ng-switch-when=\"date\">\n" +
     "    <table>\n" +
@@ -734,7 +725,8 @@ angular.module("datePicker").run(["$templateCache", function($templateCache) {
     "</div>\n"
   );
 
-  $templateCache.put("templates/daterange.html",
+
+  $templateCache.put('app/templates/daterange.html',
     "<div>\n" +
     "    <table>\n" +
     "        <tr>\n" +

diff --git a/dist/index.min.css b/dist/index.min.css