Skip to content

Commit 12c2b21

Browse files
authored
Merge pull request #80 from talgautb/master
Fix destroy/build functions, update packages
2 parents 492612b + cbcd08e commit 12c2b21

8 files changed

+15
-13
lines changed

dist/jquery.multiscroll.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,7 @@
839839
MS.destroy = function() {
840840
MS.setKeyboardScrolling(false);
841841
MS.setMouseWheelScrolling(false);
842+
removeTouchHandler();
842843

843844
$(window)
844845
.off('hashchange', hashChangeHandler)
@@ -856,6 +857,7 @@
856857
MS.build = function() {
857858
MS.setKeyboardScrolling(true);
858859
MS.setMouseWheelScrolling(true);
860+
addTouchHandler();
859861

860862
$(window)
861863
.on('hashchange', hashChangeHandler)

dist/jquery.multiscroll.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.multiscroll.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.multiscroll.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.multiscroll.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var gulp = require('gulp');
22
var rename = require('gulp-rename');
33
var sourcemaps = require('gulp-sourcemaps');
44
var uglify = require('gulp-uglify');
5-
var sass = require('gulp-sass');
65
var minifyCss = require('gulp-clean-css');
76

87
gulp.task('css', function() {
@@ -15,7 +14,7 @@ gulp.task('css', function() {
1514
keepSpecialComments: '1'
1615
}))
1716
.pipe(rename({suffix: '.min'}))
18-
.pipe(sourcemaps.write('.'))
17+
.pipe(sourcemaps.write('.'))
1918
.pipe(gulp.dest('./dist'));
2019
});
2120

@@ -31,4 +30,4 @@ gulp.task('js', function() {
3130
.pipe(gulp.dest('./dist'));
3231
});
3332

34-
gulp.task('default', ['css', 'js']);
33+
gulp.task('default', ['css', 'js']);

jquery.multiscroll.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,7 @@
839839
MS.destroy = function() {
840840
MS.setKeyboardScrolling(false);
841841
MS.setMouseWheelScrolling(false);
842+
removeTouchHandler();
842843

843844
$(window)
844845
.off('hashchange', hashChangeHandler)
@@ -856,6 +857,7 @@
856857
MS.build = function() {
857858
MS.setKeyboardScrolling(true);
858859
MS.setMouseWheelScrolling(true);
860+
addTouchHandler();
859861

860862
$(window)
861863
.on('hashchange', hashChangeHandler)

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525
},
2626
"homepage": "http://www.alvarotrigo.com/multiScroll/",
2727
"devDependencies": {
28-
"gulp": "^3.9.0",
29-
"gulp-clean-css": "^2.0.8",
28+
"gulp": "^3.9.1",
29+
"gulp-clean-css": "^2.0.13",
3030
"gulp-rename": "^1.2.2",
31-
"gulp-sass": "^2.0.4",
32-
"gulp-sourcemaps": "^1.6.0",
33-
"gulp-uglify": "^1.4.1"
31+
"gulp-sourcemaps": "^2.1.1",
32+
"gulp-uglify": "^2.0.0"
3433
}
3534
}

0 commit comments

Comments
 (0)