Merge pull request #53 from AdriVanHoudt/master

Updates
CrackerakiUA · Sep 18, 2017 · cfaa2ef · cfaa2ef
2 parents 4ca959c + bac3ffc
commit cfaa2ef
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 94 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,6 +42,5 @@ module.exports = {
         "no-extend-native": ["error"],
         "new-cap": ["error"],
         "no-use-before-define": ["error"],
-
     }
 };
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
+sudo: false
+
 language: node_js
 node_js:
-  - "6.1"
-before_script:
-  - npm install -g gulp
+  - "6"
 script: 
-  - gulp lint -v
+  - npm run lint
diff --git a/compile/minified/ui-cropper.js b/compile/minified/ui-cropper.js
diff --git a/compile/unminified/ui-cropper.css b/compile/unminified/ui-cropper.css
@@ -1,57 +1,41 @@
-/* line 1, ../../source/scss/ui-cropper.scss */
 ui-cropper {
   width: 100%;
-  display: block;
-}
-/* line 3, ../../source/scss/ui-cropper.scss */
-ui-cropper.fixed-height {
-  height: 100%;
-  position: relative;
-  overflow: hidden;
-}
-/* line 7, ../../source/scss/ui-cropper.scss */
-ui-cropper.fixed-height canvas {
-  display: block;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-}
-/* line 14, ../../source/scss/ui-cropper.scss */
-ui-cropper.full-width {
-  text-align: center;
-}
-/* line 16, ../../source/scss/ui-cropper.scss */
-ui-cropper.full-width canvas {
-  display: inline;
-}
-/* line 22, ../../source/scss/ui-cropper.scss */
-ui-cropper canvas {
-  outline: none;
-  -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-  /* mobile webkit */
-}
-/* line 28, ../../source/scss/ui-cropper.scss */
-ui-cropper .loading {
-  width: 100%;
-  font-size: 16px;
-  font-weight: bold;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  display: -webkit-flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-align-items: center;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-justify-content: center;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.75);
-}
-/* line 29, ../../source/scss/ui-cropper.scss */
-ui-cropper .loading .fixed-height {
-  height: 100%;
-  position: absolute;
-}
+  display: block; }
+  ui-cropper.fixed-height {
+    height: 100%;
+    position: relative;
+    overflow: hidden; }
+    ui-cropper.fixed-height canvas {
+      display: block;
+      position: absolute;
+      top: 50%;
+      left: 50%; }
+  ui-cropper.full-width {
+    text-align: center; }
+    ui-cropper.full-width canvas {
+      display: inline; }
+  ui-cropper canvas {
+    outline: none;
+    -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+    /* mobile webkit */ }
+  ui-cropper .loading {
+    width: 100%;
+    font-size: 16px;
+    font-weight: bold;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    display: -webkit-flex;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+    -webkit-align-items: center;
+    -webkit-box-pack: center;
+        -ms-flex-pack: center;
+            justify-content: center;
+    -webkit-justify-content: center;
+    color: white;
+    background-color: rgba(0, 0, 0, 0.75); }
+    ui-cropper .loading .fixed-height {
+      height: 100%;
+      position: absolute; }
diff --git a/compile/unminified/ui-cropper.js b/compile/unminified/ui-cropper.js
@@ -5,7 +5,7 @@
  * Copyright (c) 2017 Alex Kaul
  * License: MIT
  *
- * Generated at Friday, September 8th, 2017, 10:00:18 AM
+ * Generated at Friday, September 8th, 2017, 5:11:05 PM
  */
 (function() {
 angular.module('uiCropper', []);
@@ -3014,7 +3014,6 @@ angular.module('uiCropper').factory('cropHost', ['$document', '$q', 'cropAreaCir
         };
     };
 }]);
-
 angular.module('uiCropper').factory('cropPubSub', [function() {
     return function() {
         var events = {};
@@ -3378,7 +3377,6 @@ angular.module('uiCropper').directive('uiCropper', ['$timeout', 'cropHost', 'cro
 }]);
 
 }());
-
 /* canvas-toBlob.js
  * A canvas.toBlob() implementation.
  * 2013-12-27
@@ -3502,7 +3500,6 @@ angular.module('uiCropper').directive('uiCropper', ['$timeout', 'cropHost', 'cro
     }
 }(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
 
-
 /*!
  * Color Thief v2.0
  * by Lokesh Dhakar - http://www.lokeshdhakar.com
@@ -4153,7 +4150,6 @@ angular.module('uiCropper').directive('uiCropper', ['$timeout', 'cropHost', 'cro
     }
 }.call(this));
 
-
 /**
  * Mega pixel image rendering library for iOS6 Safari
  *

diff --git a/example/index.html b/example/index.html
@@ -11,6 +11,7 @@
 
     <link href="css/bootstrap.min.css" rel="stylesheet">
     <link href="css/custom-style.css" rel="stylesheet">
+    <link href="../compile/minified/ui-cropper.css?1" rel="stylesheet">
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -258,8 +259,8 @@ <h4>Area crop type</h4>
 
 <script src="js/jquery.js"></script>
 <script src="js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../bower_components/angular/angular.min.js"></script>
-<script type="text/javascript" src="../compile/unminified/ui-cropper.js?1"></script>
+<script type="text/javascript" src="../node_modules/angular/angular.min.js"></script>
+<script type="text/javascript" src="../compile/minified/ui-cropper.js?1"></script>
 <script type="text/javascript" src="js/custom-javascript.js"></script>
 
 </body>

diff --git a/gulpfile.js b/gulpfile.js
@@ -4,7 +4,7 @@ var argv         = require('minimist')(process.argv.slice(2)),
     header       = require('gulp-header'),
     gutil        = require('gulp-util'),
     ngAnnotate   = require('gulp-ng-annotate'),
-    compass      = require('gulp-compass'),
+    sass      = require('gulp-sass'),
     refresh      = require('gulp-livereload'),
     prefix       = require('gulp-autoprefixer'),
     cleanCSS    = require('gulp-clean-css'),
@@ -68,12 +68,10 @@ var Config = {
 // Compile Styles
 gulp.task('styles', function () {
     return gulp.src(Config.paths.source.scss + '/ui-cropper.scss')
-        .pipe(compass({
-            sass: Config.paths.source.scss,
-            css: Config.paths.compileUnminified.css,
-            errLogToConsole: true
+        .pipe(sass())
+        .pipe(prefix({ 
+            browsers: ['last 2 version', '> 5%', 'safari 5', 'ie 8', 'ie 7', 'opera 12.1', 'ios 6', 'android 4'] 
         }))
-        .pipe(prefix('last 2 version', '> 5%', 'safari 5', 'ie 8', 'ie 7', 'opera 12.1', 'ios 6', 'android 4'))
         .pipe(gulp.dest(Config.paths.compileUnminified.css), {overwrite: true});
 });
 

diff --git a/package.json b/package.json
@@ -39,31 +39,33 @@
     "type": "git",
     "url": "https://github.com/CrackerakiUA/ui-cropper/"
   },
+  "scripts": {
+    "build": "gulp build",
+    "lint": "gulp lint",
+    "dev": "gulp"
+  },
   "dependencies": {
     "angular": ">=1.4.0"
   },
   "devDependencies": {
-    "connect-livereload": "^0.4.0",
-    "eslint": "^3.12.2",
+    "connect-livereload": "^0.6.0",
+    "eslint": "^4.6.1",
     "express": "^4.4.5",
     "gulp": "^3.8.5",
-    "gulp-autoprefixer": "0.0.8",
-    "gulp-clean-css": "^2.0.12",
-    "gulp-compass": "^1.1.9",
-    "gulp-concat": "^2.2.0",
-    "gulp-concat-util": "^0.2.3",
-    "gulp-eslint": "^3.0.1",
+    "gulp-autoprefixer": "^4.0.0",
+    "gulp-clean-css": "^3.8.0",
+    "gulp-concat-util": "^0.5.5",
+    "gulp-eslint": "^4.0.0",
     "gulp-header": "^1.0.2",
-    "gulp-livereload": "^2.1.0",
-    "gulp-ng-annotate": "^0.2.0",
-    "gulp-open": "^0.2.8",
-    "gulp-plumber": "^0.6.3",
-    "gulp-rimraf": "^0.1.0",
-    "gulp-uglify": "^0.3.1",
-    "gulp-util": "^2.2.19",
-    "minimist": "^0.2.0",
-    "opn": "^0.1.2",
-    "run-sequence": "^1.1.0",
-    "tiny-lr": "0.0.7"
+    "gulp-livereload": "^2.1.1",
+    "gulp-ng-annotate": "^2.0.0",
+    "gulp-rimraf": "^0.2.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-uglify": "^3.0.0",
+    "gulp-util": "^3.0.8",
+    "minimist": "^1.2.0",
+    "opn": "^5.1.0",
+    "run-sequence": "^2.1.0",
+    "tiny-lr": "^0.0.7"
   }
 }