summaryrefslogtreecommitdiff
path: root/StoneIsland/www/js/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www/js/vendor')
-rw-r--r--StoneIsland/www/js/vendor/view/router.js8
-rw-r--r--StoneIsland/www/js/vendor/view/scrollable.js12
2 files changed, 17 insertions, 3 deletions
diff --git a/StoneIsland/www/js/vendor/view/router.js b/StoneIsland/www/js/vendor/view/router.js
index d766880f..a8ec331f 100644
--- a/StoneIsland/www/js/vendor/view/router.js
+++ b/StoneIsland/www/js/vendor/view/router.js
@@ -14,8 +14,10 @@ var Router = View.extend({
},
parseRoute: function(pathname){
-
- if (pathname[0] !== "/" && pathname[0] !== "#") { pathname = "/" + pathname }
+
+ pathname = pathname.replace(/^#/, "")
+
+ if (pathname[0] !== "/") { pathname = "/" + pathname }
var routes = this.routes,
path = pathname.split("/");
@@ -25,7 +27,7 @@ var Router = View.extend({
path[i] = null
}
}
-
+
if (pathname in routes) {
this[this.routes[pathname]]()
return
diff --git a/StoneIsland/www/js/vendor/view/scrollable.js b/StoneIsland/www/js/vendor/view/scrollable.js
new file mode 100644
index 00000000..d3540723
--- /dev/null
+++ b/StoneIsland/www/js/vendor/view/scrollable.js
@@ -0,0 +1,12 @@
+var ScrollableView = View.extend({
+
+ deferScrollToTop: function(){
+ setTimeout(this.scrollToTop.bind(this), 0)
+ },
+
+ scrollToTop: function(){
+ this.scroller.refresh()
+ app.collection.scroller.scrollTo(0, 0)
+ },
+
+}) \ No newline at end of file