mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
merge
This commit is contained in:
commit
a81d61ba1b
File diff suppressed because one or more lines are too long
10
build/gui.js
10
build/gui.js
File diff suppressed because one or more lines are too long
@ -3,7 +3,7 @@ var examples = {};
|
||||
examples[ 'default' ] = function() {
|
||||
|
||||
var gui = new Gui();
|
||||
gui.anon( 'hi', 'todo' );
|
||||
//gui.anon( 'hi', 'todo' );
|
||||
return gui;
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Gui, Polymer, PathObserver */
|
||||
'use strict';
|
||||
|
||||
|
||||
// [ ] onFinishChange()
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Gui, Polymer */
|
||||
'use strict';
|
||||
|
||||
|
||||
Gui.register( 'controller-boolean', function( value ) {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Gui, Polymer */
|
||||
'use strict';
|
||||
|
||||
|
||||
Gui.register( 'controller-function', function( value ) {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Gui, Polymer */
|
||||
'use strict';
|
||||
|
||||
|
||||
/*
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Gui, Polymer */
|
||||
'use strict';
|
||||
|
||||
|
||||
Gui.register( 'controller-string', function( value ) {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Polymer, Path, Gui */
|
||||
'use strict';
|
||||
|
||||
|
||||
// [ ] scrolling when docked
|
||||
// [ ] scrolling when window short and not docked
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* globals Polymer */
|
||||
'use strict';
|
||||
|
||||
|
||||
Polymer( 'gui-row', {
|
||||
|
||||
|
@ -12,7 +12,7 @@ gulp.task( 'default', ['docs', 'build'] )
|
||||
gulp.task( 'watch', ['default'], function() {
|
||||
|
||||
karma.server.start( {
|
||||
frameworks: ['jasmine'],
|
||||
frameworks: [ 'jasmine' ],
|
||||
files: [
|
||||
'build/gui.js',
|
||||
'tests/*.js'
|
||||
@ -93,7 +93,7 @@ gulp.task( 'docs', function() {
|
||||
gulp.task( 'clean', function() {
|
||||
|
||||
return gulp.src( ['build/*', '**/*.css'] )
|
||||
.pipe( $.clean() );
|
||||
.pipe( $.rimraf() );
|
||||
|
||||
} );
|
||||
|
||||
|
@ -4,7 +4,6 @@
|
||||
"devDependencies": {
|
||||
"browser-sync": "^1.3.6",
|
||||
"gulp": "^3.8.7",
|
||||
"gulp-clean": "^0.3.1",
|
||||
"gulp-if": "^1.2.4",
|
||||
"gulp-insert": "^0.4.0",
|
||||
"gulp-jscs": "^1.1.2",
|
||||
@ -14,6 +13,7 @@
|
||||
"gulp-reload": "0.0.4",
|
||||
"gulp-rename": "^1.2.0",
|
||||
"gulp-replace": "^0.4.0",
|
||||
"gulp-rimraf": "^0.1.0",
|
||||
"gulp-stylus": "^1.3.0",
|
||||
"gulp-vulcanize": "^1.0.0",
|
||||
"gulp-watch": "^0.6.9",
|
||||
|
Loading…
Reference in New Issue
Block a user