v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-16 12:20:09 -07:00
Code Issues Projects Releases Wiki Activity

Fix jquery ui slider touch control

Browse Source
This commit is contained in:
Unknown 2017-06-02 03:22:28 +02:00
parent f183be0a55
commit a404d625d7
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Resources/assets/js/slider.js
View File

@ -17,7 +17,7 @@ $(document).ready(function() {
$("#" + id + "_value").text(ui.values[0] + " - " + ui.values[1]); $("#" + id + "_value").text(ui.values[0] + " - " + ui.values[1]);
} }
}).slider("pips", {}); }).slider("pips", {}).draggable();
$("#" + id + "_value").text($slider.slider("values", 0) + ' - ' + $slider.slider("values", 1)) $("#" + id + "_value").text($slider.slider("values", 0) + ' - ' + $slider.slider("values", 1))
}); });

5
bower.json
View File

@ -18,7 +18,8 @@
"dependencies": { "dependencies": {
"jQuery-ui-Slider-Pips": "jquery-ui-slider-pips#^1.11.4", "jQuery-ui-Slider-Pips": "jquery-ui-slider-pips#^1.11.4",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"SVG-Loaders": "svg-loaders#^1.0.2", "select2": "^4.0.3",
"select2": "^4.0.3" "three.js": "threejs#*",
"jqueryui-touch-punch": "*"
} }
} }

13
gulpfile.js
View File

@ -17,16 +17,16 @@ gulp.task('css', function() {
gulp.task('three', function() { gulp.task('three', function() {
gulp.src([ gulp.src([
'node_modules/three/build/three.js', 'bower_components/three/build/three.js',
'node_modules/three/examples/js/libs/stats.min.js', 'bower_components/three/examples/js/libs/stats.min.js',
'node_modules/three/examples/js/loaders/STLLoader.js', 'bower_components/three/examples/js/loaders/STLLoader.js',
'node_modules/three/examples/js/Detector.js', 'bower_components/three/examples/js/Detector.js',
]) ])
.pipe(plugins.concat('three.js')) .pipe(plugins.concat('three.js'))
.pipe(gulp.dest('web/resources/js')); .pipe(gulp.dest('web/resources/js'));
gulp.src([ gulp.src([
'node_modules/three/examples/js/controls/OrbitControls.js', 'bower_components/three/examples/js/controls/OrbitControls.js',
]) ])
.pipe(plugins.concat('OrbitControls.js')) .pipe(plugins.concat('OrbitControls.js'))
.pipe(gulp.dest('web/resources/js')); .pipe(gulp.dest('web/resources/js'));
@ -37,11 +37,11 @@ gulp.task('js', function() {
'bower_components/jquery/dist/jquery.js', 'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/jquery-ui.js', 'bower_components/jquery-ui/jquery-ui.js',
'bower_components/jQuery-ui-Slider-Pips/dist/jquery-ui-slider-pips.js', 'bower_components/jQuery-ui-Slider-Pips/dist/jquery-ui-slider-pips.js',
'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js',
'bower_components/select2/dist/js/select2.full.js', 'bower_components/select2/dist/js/select2.full.js',
'node_modules/semantic-ui/dist/semantic.js', 'node_modules/semantic-ui/dist/semantic.js',
'node_modules/lightbox2/dist/js/lightbox.js', 'node_modules/lightbox2/dist/js/lightbox.js',
'app/Resources/assets/js/**.js', 'app/Resources/assets/js/**.js',
'node_modules/three/examples/js/libs/stats.min.js'
]) ])
.pipe(plugins.concat('main.js')) .pipe(plugins.concat('main.js'))
.pipe(gulp.dest('web/resources/js')); .pipe(gulp.dest('web/resources/js'));
@ -62,7 +62,6 @@ gulp.task('files:images', function () {
.pipe(gulp.dest('web/resources/images')); .pipe(gulp.dest('web/resources/images'));
}); });
gulp.task('watch', ['js', 'css', 'three'], function () { gulp.task('watch', ['js', 'css', 'three'], function () {
gulp.watch('app/Resources/assets/js/**.js' , ['js']); gulp.watch('app/Resources/assets/js/**.js' , ['js']);
gulp.watch('app/Resources/assets/style/**/*.scss' , ['css']); gulp.watch('app/Resources/assets/style/**/*.scss' , ['css']);

5
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "printabrick", "name": "printabrick",
"version": "1.0.0", "version": "1.0.0",
"description": "Website for printable building kits", "description": "Web catalogue of LEGO® parts for 3D printing",
"main": "web/app.php", "main": "web/app.php",
"dependencies": { "dependencies": {
"gulp": "^3.9.1", "gulp": "^3.9.1",
@ -12,8 +12,7 @@
"gulp-watch": "^4.3.11", "gulp-watch": "^4.3.11",
"jquery": "^3.2.1", "jquery": "^3.2.1",
"lightbox2": "^2.9.0", "lightbox2": "^2.9.0",
"semantic-ui": "^2.2.9", "semantic-ui": "^2.2.9"
"three": "^0.84.0"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {