Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ariutta/svg-pan-zoom
Browse files Browse the repository at this point in the history
  • Loading branch information
ariutta committed Sep 21, 2019
2 parents 21ff2a5 + caf598c commit 31e763a
Show file tree
Hide file tree
Showing 6 changed files with 349 additions and 58 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ Best way to contribute is to create a pull request. In order to create a pull re
* Run `npm install`
* Run `npm install -g gulp` if you don't have it already installed globally
* Running `gulp` will listen for source files changes (in `src` folder) and will automatically build distribution files
* Running `gulp browserify` will compile source files
* Running `gulp check` for some syntax errors
* Running `gulp compile` will compile source files
* Running `gulp check` will check syntax and automatically fix some errors
* Running `gulp test` will run tests
* Running `gulp build` will prepare the project for a new release
* Implement the change using `gulp` or `gulp browserify`
* Implement the change using `gulp` or `gulp compile`
* After change is done test it with `gulp check` and `gulp test`
* Commit only meaningful changes. **Do not commit distribution files (`dist` folder)**. Distribution files are built only before a release
* Push your changes into your fork
Expand Down
2 changes: 1 addition & 1 deletion dist/svg-pan-zoom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// svg-pan-zoom v3.6.0
// svg-pan-zoom v3.6.1
// https://github.com/ariutta/svg-pan-zoom
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
var SvgUtils = require("./svg-utilities");
Expand Down
2 changes: 1 addition & 1 deletion dist/svg-pan-zoom.min.js

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ var gulp = require("gulp"),
"\n";

function isFixed(file) {
return file.eslint !== null && file.eslint.fixed;
// TODO: why is file.eslint undefined?
return typeof file.eslint === "object" && file.eslint.fixed;
}

/**
Expand All @@ -47,7 +48,7 @@ function compile() {
* Watch script
*/
function watch() {
return gulp.watch("./src/**/*.js", [compile]);
return gulp.watch("./src/**/*.js", gulp.series("compile"));
}

/**
Expand Down Expand Up @@ -79,9 +80,9 @@ function check() {
)
.pipe(eslint.format())
.pipe(gulpIf(isFixed, gulp.dest("./")))
// uncomment to stop on error
.pipe(eslint.failAfterError())
);
// uncomment to stop on error
//.pipe(eslint.failAfterError())
}

exports.compile = compile;
Expand All @@ -92,7 +93,7 @@ exports.check = check;
/**
* Build
*/
exports.build = gulp.series([test, check, compile]);
exports.build = gulp.series([check, compile, test]);

/**
* Default task
Expand Down
Loading

0 comments on commit 31e763a

Please sign in to comment.