Merge pull request #1189 from ploxiln/bump_handlebars

nsqadmin: update run-time js deps, fix channel delete
nsqio · Sep 22, 2019 · fa9f2b4 · fa9f2b4
2 parents 09b06de + 4d384b4
commit fa9f2b4
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 199 deletions.
diff --git a/nsqadmin/bindata.go b/nsqadmin/bindata.go
diff --git a/nsqadmin/http.go b/nsqadmin/http.go
@@ -173,6 +173,8 @@ func (s *httpServer) staticAssetHandler(w http.ResponseWriter, req *http.Request
 	ct := mime.TypeByExtension(ext)
 	if ct == "" {
 		switch ext {
+		case ".map":
+			ct = "application/json"
 		case ".svg":
 			ct = "image/svg+xml"
 		case ".woff":

diff --git a/nsqadmin/package-lock.json b/nsqadmin/package-lock.json
diff --git a/nsqadmin/package.json b/nsqadmin/package.json
@@ -15,17 +15,17 @@
     "gulp-sourcemaps": "^2.6.4",
     "gulp-task-listing": "^1.0.0",
     "gulp-uglify": "^3.0.1",
-    "handlebars": "^4.0.11",
+    "handlebars": "^4.2.0",
     "hbsfy": "^2.8.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
-    "backbone": "^1.2.3",
+    "backbone": "^1.4.0",
     "bootbox": "^4.4.0",
-    "bootstrap": "^3.3.6",
-    "jquery": "^3.3.1",
-    "moment": "^2.11.2",
+    "bootstrap": "^3.4.1",
+    "jquery": "^3.4.1",
+    "moment": "^2.24.0",
     "underscore": "^1.8.3"
   },
   "browserify": {

diff --git a/nsqadmin/static/js/views/channel.js b/nsqadmin/static/js/views/channel.js
@@ -43,10 +43,11 @@ var ChannelView = BaseView.extend({
                 return;
             }
             if (action === 'delete') {
+                var topic = this.model.get('topic');
                 $.ajax(this.model.url(), {'method': 'DELETE'})
                     .done(function() {
                         window.location = AppState.basePath('/topics/' +
-                            encodeURIComponent(this.model.get('topic')));
+                            encodeURIComponent(topic));
                     })
                     .fail(this.handleAJAXError.bind(this));
             } else {