Use router.uiRoot in views, so we don't need to wait for Backbone.his…

…tory to initilize
swagger-api · May 4, 2015 · ce97046 · ce97046
1 parent d0b553d
commit ce97046
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -104,7 +104,7 @@ gulp.task('copy', ['less'], function() {
 
   // copy all files inside html folder
   gulp
-    .src(['./src/main/html/**/*'])
+    .src(['./src/main/html/**/*','./src/main/html/.htaccess'])
     .pipe(gulp.dest('./dist'))
     .on('error', log);
 });

diff --git a/src/main/javascript/view/OperationView.js b/src/main/javascript/view/OperationView.js
@@ -19,7 +19,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     this.parentId = this.model.parentId;
     this.nickname = this.model.nickname;
     this.model.encodedParentId = encodeURIComponent(this.parentId);
-    this.model.uiRoot = Backbone.history.root;
+    this.model.uiRoot = this.router.uiRoot;
     return this;
   },
 

diff --git a/src/main/javascript/view/ResourceView.js b/src/main/javascript/view/ResourceView.js
@@ -11,7 +11,7 @@ SwaggerUi.Views.ResourceView = Backbone.View.extend({
     if (this.model.description) {
       this.model.summary = this.model.description;
     }
-    this.model.uiRoot = Backbone.history.root;
+    this.model.uiRoot = this.router.uiRoot;
   },
 
   render: function(){