Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor updates and improvements. #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor updates and improvements. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# System files
.DS_Store

# Node modules
node_modules
*.log

# Managers
node_modules
bower_components
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"index.html"
],
"dependencies": {
"jquery": "1.10.2"
"jquery": "1.11.1"
}
}
6 changes: 3 additions & 3 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link id="scrollUpTheme" rel="stylesheet" href="css/themes/tab.css">
<link rel="stylesheet" href="css/labs.css">

<script src="../dist/lib/jquery-1.11.1.min.js"></script>
<script src="../dist/lib/jquery.min.js"></script>
<script src="../dist/jquery.scrollUp.min.js"></script>
<script>

Expand Down Expand Up @@ -59,7 +59,7 @@
$(function () {
$.scrollUp({
animation: 'fade',
activeOverlay: '#00FFFF'
activeOverlay: '#00FFFF',
});
});
$('#scrollUpTheme').attr('href', 'css/themes/link.css?1.1');
Expand All @@ -82,7 +82,7 @@
$(function () {
$.scrollUp({
animation: 'slide',
activeOverlay: '#00FFFF'
activeOverlay: '#00FFFF',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commas aren't really needed here and the above case.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who said these are required? I prefer to put comma after the last element, in case I would like to add another line. I think, I've made this (tiny) change automatically. Since it has no impact on the behavior, is this conversation needed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is needed. Useless changes are useless.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But those two commas are only a tiny part of the whole PR. Unless the author says to remove them, EOT.

});
});
$('#scrollUpTheme').attr('href', 'css/themes/tab.css?1.1');
Expand Down
205 changes: 0 additions & 205 deletions dist/lib/jquery.easing.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions dist/lib/jquery-1.11.1.min.js → dist/lib/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var header = require('gulp-header');
var rename = require('gulp-rename');
var del = require('del');
var pkg = require('./package.json');
var copy = require('gulp-copy');

// Banner
var banner = ['/*!',
Expand All @@ -15,10 +16,13 @@ var banner = ['/*!',
' */',
''].join('\n');


// Clean
gulp.task('clean', function(cb) {
del(['dist/*.js'], cb);
// Clean dist directory
del(['dist/*'], cb);
// Copy JS lib to dist directory
gulp
.src('bower_components/jquery/dist/jquery.min.js')
.pipe(copy('dist/lib', { prefix: 3 }));
});

// Default task
Expand All @@ -35,5 +39,5 @@ gulp.task('default', function() {

// Watch
gulp.task('watch', function() {
gulp.watch(config.src, ['default']);
gulp.watch('src/*', ['default']);
});
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"gulp-jshint": "^1.6.4",
"gulp-rename": "^1.2.0",
"gulp-uglify": "^0.3.1",
"jshint-stylish": "^0.3.0"
"jshint-stylish": "^0.3.0",
"gulp-copy": "0.0.2"
},
"engines": {
"node": ">=0.10.3"
Expand Down