Skip to content

Feature/event on scroll #452

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

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Feature/event on scroll #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
74bea28
Breaks code in smaller files && adjusts grunt tasks accordingly
Oct 10, 2016
be0dd8c
Latest build
Oct 10, 2016
244b55b
Test page adjustments
Oct 10, 2016
51ab3df
Adds jquery && lodash dependencies
Oct 11, 2016
ff93d32
Updates karma
Oct 11, 2016
b31024a
Introduces and implements GridsterViewport. Adds scroll listener and …
Oct 11, 2016
5c59f08
Latest build
Oct 11, 2016
0516c62
Adjusts test page
Oct 11, 2016
ad984ff
Adds grunt concat && umd jobs
Oct 13, 2016
022f8e9
Latest builds - both uglified and umd&&concat
Oct 13, 2016
1d6b0f6
Adjusts refs to test and index html pages (both local builds and thir…
Oct 13, 2016
e8dd608
Adjusts proper port for protractor
Oct 13, 2016
88b44f1
Moves onScroll method to controller && onScroll is being called on ev…
Oct 20, 2016
1519a20
Latest build
Oct 20, 2016
350aa59
Oooops! Fixes some tests :)
Oct 20, 2016
8d78576
dragStop calls scope.$apply only if callback is provided
Nov 21, 2016
4dcb541
Call scope.$apply only when callbacks exist
Nov 21, 2016
87d7b99
Execute scope.$apply only if there's a callback
Nov 21, 2016
6f411d8
Throttle the mouseMove callback
Nov 21, 2016
af869db
Latest build
Nov 21, 2016
132f24c
Ditches gridsterDebounce in onResize handler in favour of lodash debo…
Nov 22, 2016
b42c129
Latest build
Nov 22, 2016
69c9a63
One more conditional scope.$apply
Nov 22, 2016
508b31f
Latest build
Nov 22, 2016
eca3a60
Adds a couple of more 9s to make it work for longer grids too :/
Nov 22, 2016
5153f50
Ditches gridsterDebounce entirely. Uses strictly lodash's debounce.
Nov 22, 2016
676d4e7
Latest build
Nov 22, 2016
8906f11
Sets debouncedTransitionEndPublisher with a leading edge property. A …
Nov 22, 2016
3912fa9
Upgrades lodash version to 4.17.4
May 10, 2017
66d9821
Allows view port settings / status hash to be reset from the gridster…
Nov 26, 2017
97b2527
Latest build
Nov 26, 2017
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
26 changes: 22 additions & 4 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = function(grunt) {
},
connect: {
options: {
port: 9000,
port: 9001,
hostname: 'localhost'
},
dev: {
Expand Down Expand Up @@ -87,6 +87,24 @@ module.exports = function(grunt) {
}
}
},
concat: {
default: {
src: ['src/angular-gridster.module.js', 'src/**/*.js'],
dest: 'dist/angular-gridster.js'
},
},
umd: {
default: {
options: {
src: 'dist/angular-gridster.js',
dest: 'dist/angular-gridster.js',
objectToExport: 'angular',
deps: {
cjs: ['angular']
}
}
}
},
uglify: {
dist: {
options: {
Expand All @@ -100,13 +118,13 @@ module.exports = function(grunt) {
].join('\n')
},
files: {
'dist/angular-gridster.min.js': ['src/angular-gridster.js']
'dist/angular-gridster.min.js': ['dist/angular-gridster.js']
}
}
},
watch: {
dev: {
files: ['Gruntfile.js', 'karma.conf.js', 'ptor.conf.js', 'src/*', 'test/**/*.js'],
files: ['Gruntfile.js', 'karma.conf.js', 'ptor.conf.js', 'src/**/*.js', 'test/**/*.js'],
tasks: ['jsbeautifier', 'jshint', 'uglify', 'less', 'karma:unit:run'],
options: {
reload: true,
Expand All @@ -121,7 +139,7 @@ module.exports = function(grunt) {
}
});

grunt.registerTask('default', ['jsbeautifier', 'jshint', 'uglify', 'less']);
grunt.registerTask('default', ['jsbeautifier', 'jshint', 'concat', 'umd', 'uglify', 'less']);

grunt.registerTask('dev', ['connect:dev', 'karma:unit:start', 'watch:dev']);
grunt.registerTask('e2e', ['connect:cli', 'protractor', 'watch:e2e']);
Expand Down
6 changes: 4 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
],
"dependencies": {
"angular": ">= 1.2.0",
"javascript-detect-element-resize": "~0.5.1"
"javascript-detect-element-resize": "~0.5.1",
"lodash": "4.17.4",
"jquery": "2.1.x"
},
"devDependencies": {
"angular-mocks": ">= 1.2.0",
"angular-animate": ">= 1.2.0",
"jquery": "*",
"jquery": "2.1.x",
"jquery-simulate": "*"
},
"ignore": [
Expand Down
Loading