library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add gjslint style linter and updated javascript to match

Browse Source
This commit is contained in:
Doug Fritz 2014-09-03 16:33:28 -07:00
parent d3cec69596
commit 7f409799dd
10 changed files with 508 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/Gui.js
View File

@ -84,13 +84,13 @@
var args = Array.prototype.slice.apply(arguments); var args = Array.prototype.slice.apply(arguments);
args.unshift('dat-gui ::'); args.unshift('dat-gui ::');
console.error.apply(console, args); console.error.apply(console, args);
} };
Gui.warn = function() { Gui.warn = function() {
var args = Array.prototype.slice.apply(arguments); var args = Array.prototype.slice.apply(arguments);
args.unshift('dat-gui ::'); args.unshift('dat-gui ::');
console.warn.apply(console, args); console.warn.apply(console, args);
} };
// Old namespaces // Old namespaces

3
elements/controller-base/controller-base.js
View File

@ -50,7 +50,8 @@ Polymer('controller-base', {
listen: function() { listen: function() {
Gui.warn( 'controller.listen() is deprecated. All controllers are listened for free.' ); Gui.warn('controller.listen() is deprecated. ' +
'All controllers are listened for free.');
return this; return this;
}, },

3
elements/controller-number/controller-number.js
View File

@ -198,7 +198,8 @@ Polymer( 'controller-number', {
tracky: function(e) { tracky: function(e) {
this._dragFriction = Math.max( 0.01, Math.min( 1, this.map( e.dy, 50, 300, 1, 0.1 ) ) ); this._dragFriction = Math.max(0.01,
Math.min(1, this.map(e.dy, 50, 300, 1, 0.1)));
}, },

13
elements/gui-panel/gui-panel.js
View File

@ -5,7 +5,8 @@ Polymer('gui-panel', {
docked: false, docked: false,
open: true, open: true,
touch: 'ontouchstart' in window || !!window.DocumentTouch && document instanceof DocumentTouch, touch: ('ontouchstart' in window) ||
(!!window.DocumentTouch && document instanceof DocumentTouch),
ready: function() { ready: function() {
@ -41,7 +42,8 @@ Polymer('gui-panel', {
var value = Path.get(path).getValueFrom(object); var value = Path.get(path).getValueFrom(object);
if (value == null || value == undefined) { if (value == null || value == undefined) {
return Gui.error( object + ' doesn\'t have a value for path "' + path + '".' ); return Gui.error(object +
' doesn\'t have a value for path "' + path + '".');
} }
var args = Array.prototype.slice.call(arguments, 2); var args = Array.prototype.slice.call(arguments, 2);
@ -52,7 +54,7 @@ Polymer('gui-panel', {
return Gui.error('Unrecognized type:', value); return Gui.error('Unrecognized type:', value);
} }
controller.watch( object, path ) controller.watch(object, path);
controller.init.apply(controller, args); controller.init.apply(controller, args);
// Make row // Make row
@ -132,9 +134,10 @@ Polymer('gui-panel', {
listenAll: function() { listenAll: function() {
Gui.warn( 'controller.listenAll() is deprecated. All controllers are listened for free.' ); Gui.warn('controller.listenAll() is deprecated. ' +
'All controllers are listened for free.');
}, }
// todo: domElement // todo: domElement

6
gulpfile.js
View File

@ -49,9 +49,9 @@ gulp.task('vulcanize', ['css'], function() {
gulp.task('lint', function() { gulp.task('lint', function() {
return gulp.src('elements/**/*.js') return gulp.src('elements/**/*.js')
//.pipe($.reload({stream: true, once: true})) //.pipe($.reload({stream: true, once: true}))
.pipe($.jshint()) .pipe($.gjslint())
.pipe($.jshint.reporter('jshint-stylish')); .pipe($.gjslint.reporter('console', {}));
//.pipe($.if(!browserSync.active, $.jshint.reporter('fail'))); //.pipe($.if(!browserSync.active, $.gjslint.reporter('fail')));
}); });
gulp.task('css', function() { gulp.task('css', function() {

3
package.json
View File

@ -4,8 +4,8 @@
"devDependencies": { "devDependencies": {
"gulp": "^3.8.7", "gulp": "^3.8.7",
"gulp-clean": "^0.3.1", "gulp-clean": "^0.3.1",
"gulp-gjslint": "^0.1.2",
"gulp-insert": "^0.4.0", "gulp-insert": "^0.4.0",
"gulp-jshint": "^1.8.4",
"gulp-load-plugins": "^0.6.0", "gulp-load-plugins": "^0.6.0",
"gulp-plates": "0.0.5", "gulp-plates": "0.0.5",
"gulp-rename": "^1.2.0", "gulp-rename": "^1.2.0",
@ -13,7 +13,6 @@
"gulp-stylus": "^1.3.0", "gulp-stylus": "^1.3.0",
"gulp-vulcanize": "^1.0.0", "gulp-vulcanize": "^1.0.0",
"gulp-watch": "^0.6.9", "gulp-watch": "^0.6.9",
"jshint-stylish": "^0.4.0",
"karma": "^0.12.23", "karma": "^0.12.23",
"karma-chrome-launcher": "^0.1.4", "karma-chrome-launcher": "^0.1.4",
"karma-jasmine": "^0.1.5", "karma-jasmine": "^0.1.5",