Use basepath in more places.

cutting-room-floor · Apr 15, 2011 · d7f4bf3 · d7f4bf3
1 parent 192b2bc
commit d7f4bf3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/mvc/models.js b/mvc/models.js
@@ -67,7 +67,7 @@ Bones.models.Tileset = Backbone.Model.extend({
     // Pass through function for determining the server-side filepath of a
     // Tileset model.
     filepath: function(path) {
-        return path + '/' + this.id + '.mbtiles';
+        return path + this.options.basepath + this.id + '.mbtiles';
     }
 });
 

diff --git a/mvc/views.js b/mvc/views.js
@@ -29,6 +29,8 @@ Backbone.View = Backbone.View.extend({
     route: function(ev) {
         var fragment = this.href(ev.currentTarget);
         if (fragment.charAt(0) === '/') {
+            // Remove the basepath from the fragment, but leave a /.
+            fragment = fragment.substr(Bones.settings.basepath.length - 1);
             var matched = _.any(Backbone.history.handlers, function(handler) {
                 if (handler.route.test(fragment)) {
                     handler.callback(fragment);
@@ -205,7 +207,7 @@ Bones.views.Map = Bones.views.HUD.extend({
     },
     render: function() {
         $(this.el).html(this.template('Map', {
-            basepath: this.options.basepath,
+            basepath: this.model.options.basepath,
             features: Bones.settings.features,
             id: this.model.get('id'),
             name: this.model.get('name'),
@@ -260,7 +262,7 @@ Bones.views.MapThumb = Backbone.View.extend({
     },
     render: function() {
         $(this.el).html(this.template('MapThumb', {
-            basepath: this.options.basepath,
+            basepath: this.model.options.basepath,
             id: this.model.get('id'),
             name: this.model.get('name'),
             thumb: this.model.thumb()

diff --git a/templates/App.hbs b/templates/App.hbs
@@ -5,9 +5,10 @@
     <title>TileStream</title>
     <script type='text/javascript'>
     // Redirect requests without the hash.
+    var basepath = '{{basepath}}';
     location.href.indexOf('#') === -1 &&
-    window.location.pathname !== '/' &&
-    (window.location = '/#' + window.location.pathname);
+    window.location.pathname !== basepath &&
+    (window.location = basepath + '#' + window.location.pathname.substr(basepath.length - 1));
     </script>
 
     <link rel='shortcut icon' href='/images/favicon.ico' type='image/x-icon' />