From 83e2befd5dfd8d667b2074f8eb039cbf1a1a6978 Mon Sep 17 00:00:00 2001 From: Joxit Date: Tue, 5 Sep 2017 23:09:19 +0200 Subject: [PATCH 1/2] [dependencies] Upgrade packages dependencies --- gulpfile.js | 6 +++--- package.json | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 35a579b..e15d940 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,7 +14,7 @@ var uglify = require('uglify-js-harmony'); var useref = require('gulp-useref'); gulp.task('html', function() { - var htmlFilter = filter('**/*.html'); + var htmlFilter = filter('**/*.html', {restore: true}); return gulp.src(['src/index.html']) .pipe(useref()) .pipe(gIf(['*.js', '!*.min.js'], minifier({}, uglify))) // FIXME @@ -26,12 +26,12 @@ gulp.task('html', function() { removeEmptyAttributes: true, minifyJS: uglify })) - .pipe(htmlFilter.restore()) + .pipe(htmlFilter.restore) .pipe(gulp.dest('dist')); }); gulp.task('clean', function(done) { - del(['dist'], done); + return del(['dist']); }); gulp.task('riot-tag', ['html'], function() { diff --git a/package.json b/package.json index a203e3d..0d2dd69 100644 --- a/package.json +++ b/package.json @@ -14,21 +14,23 @@ "dependencies": { }, "devDependencies": { - "del": "^0.1.3", + "del": "^3.0.0", "dialog-polyfill": "^0.4", "gulp": "^3.9", + "gulp-clean-css": "^3.7.0", "gulp-concat": "^2.6.0", - "gulp-filter": "^1.0.0", - "gulp-htmlmin": "^2.0.0", + "gulp-filter": "^5.0.1", + "gulp-htmlmin": "^3.0.0", "gulp-if": "^2.0.0", "gulp-license": "^1.1.0", - "gulp-clean-css": "^2.0.11", "gulp-riot": "^0.5.2", - "gulp-uglify": "^1.0.0", + "gulp-uglify": "^2.1.2", "gulp-useref": "^3.0.0", "material-design-lite": "^1.1", + "pump": "^1.0.2", "riot": "^2.3", "riotgear-router": "^1.3.1", - "uglify-js-harmony": "^2.6.2" + "uglify-js": "^3.0.28", + "uglify-js-harmony": "^2.7.7" } } From 9d48643957db26571806ac72e2e88091ff8ebeeb Mon Sep 17 00:00:00 2001 From: Joxit Date: Sun, 10 Sep 2017 20:14:16 +0200 Subject: [PATCH 2/2] [dependencies] upgrade to riot v3 --- package.json | 4 ++-- src/scripts/script.js | 6 +----- src/tags/add.tag | 12 ++++++------ src/tags/app.tag | 2 +- src/tags/catalog.tag | 10 +++++----- src/tags/change.tag | 12 ++++++------ src/tags/menu.tag | 6 +++--- src/tags/remove.tag | 4 ++-- src/tags/taglist.tag | 10 +++++----- 9 files changed, 31 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 0d2dd69..6fb586d 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,12 @@ "gulp-htmlmin": "^3.0.0", "gulp-if": "^2.0.0", "gulp-license": "^1.1.0", - "gulp-riot": "^0.5.2", + "gulp-riot": "^1.1.1", "gulp-uglify": "^2.1.2", "gulp-useref": "^3.0.0", "material-design-lite": "^1.1", "pump": "^1.0.2", - "riot": "^2.3", + "riot": "^3.7.0", "riotgear-router": "^1.3.1", "uglify-js": "^3.0.28", "uglify-js-harmony": "^2.7.7" diff --git a/src/scripts/script.js b/src/scripts/script.js index 933bab4..cd6cb8b 100644 --- a/src/scripts/script.js +++ b/src/scripts/script.js @@ -107,8 +107,4 @@ registryUI.isImageRemoveActivated = true; registryUI.catalog = {}; registryUI.taglist = {}; -riot.mount('add'); -riot.mount('change'); -riot.mount('remove'); -riot.mount('menu'); -riot.mount('app'); +riot.mount('*'); diff --git a/src/tags/add.tag b/src/tags/add.tag index 07d3eb1..46ff0bd 100644 --- a/src/tags/add.tag +++ b/src/tags/add.tag @@ -15,11 +15,11 @@ along with this program. If not, see . --> - +

Add your Server ?

- +
@@ -32,13 +32,13 @@ registryUI.addTag = registryUI.addTag || {}; registryUI.addTag.update = this.update; this.on('updated', function () { - componentHandler.upgradeElements(this['add-server-dialog']); - registryUI.addTag.dialog = registryUI.addTag.dialog || document.querySelector('#add-server-dialog'); - registryUI.addTag.addServer = registryUI.addTag.tileServerList || registryUI.addTag.dialog.querySelector('#add-server-input'); + registryUI.addTag.dialog = this.refs['add-server-dialog']; + registryUI.addTag.addServer = this.refs['add-server-input']; + componentHandler.upgradeElements(registryUI.addTag.dialog); if (!registryUI.addTag.dialog.showModal) { dialogPolyfill.registerDialog(registryUI.addTag.dialog); } - this['add-server-input'].onkeyup = function (e) { + this.refs['add-server-input'].onkeyup = function (e) { // if keyCode is Enter if (e.keyCode == 13) { registryUI.addTag.add(); diff --git a/src/tags/app.tag b/src/tags/app.tag index 500d135..b373d1c 100644 --- a/src/tags/app.tag +++ b/src/tags/app.tag @@ -16,7 +16,7 @@ --> - + diff --git a/src/tags/remove.tag b/src/tags/remove.tag index dda3040..f9433bb 100644 --- a/src/tags/remove.tag +++ b/src/tags/remove.tag @@ -15,7 +15,7 @@ along with this program. If not, see . --> - +

Remove your Registry Server ?

@@ -55,7 +55,7 @@ }; this.on('updated', function () { - registryUI.removeTag.dialog = this['remove-server-dialog']; + registryUI.removeTag.dialog = this.refs['remove-server-dialog']; if (!registryUI.removeTag.dialog.showModal) { dialogPolyfill.registerDialog(registryUI.removeTag.dialog); } diff --git a/src/tags/taglist.tag b/src/tags/taglist.tag index 0a3513a..18904c9 100644 --- a/src/tags/taglist.tag +++ b/src/tags/taglist.tag @@ -16,7 +16,7 @@ --> -
+
@@ -24,7 +24,7 @@

Tags of { registryUI.url() + '/' + registryUI.taglist.name }

- + @@ -44,7 +44,7 @@
-
+
@@ -61,7 +61,7 @@ registryUI.taglist.name = name; registryUI.taglist.instance.update(); registryUI.taglist.createSnackbar = function (msg) { - var snackbar = document.querySelector('#error-snackbar'); + var snackbar = registryUI.taglist.instance['error-snackbar']; registryUI.taglist.error = msg; var data = { message: registryUI.taglist.error, @@ -98,7 +98,7 @@ registryUI.taglist.display(); registryUI.taglist.instance.update(); this.on('updated', function () { - componentHandler.upgradeElements(this['taglist-tag']); + componentHandler.upgradeElements(this.refs['taglist-tag']); }); registryUI.taglist.reverse = function () {