Merge jquery.urlJS with vifib application

jquery.urlJS/src/jquery.urljs.js

-(function ($) {
-    'use strict';
-    $.extend({
+$.extend({
     router: {
         routes: {
             list: [],
@@ -16,7 +14,7 @@
                     'level': level,
                     'callback': function (params) {
                         if (callback !== undefined) {
-                                if (context !== undefined) {
+                            if (context === undefined) {
                                 callback(params);
                             } else {
                                 callback.call(context, params);
@@ -98,7 +96,7 @@
         },
 
         parseHash: function (hashTag) {
-                var re = new RegExp(/(?:^#([a-zA-Z0-9\/_-]+))(?:\?([A-Za-z0-9\/&=_-]+))?/g),
+            var re = new RegExp(/(?:^#?([a-zA-Z0-9\/_-]+))(?:\?([A-Za-z0-9\/&=_-]+))?/g),
                 groups = re.exec(hashTag),
                 r, params = {};
             groups.shift();
@@ -113,12 +111,11 @@
 
         hashHandler: function () {
             var hashTag = window.location.href.split('#')[1],
-                    hashInfo = this.parseHash(hashTag);
-                this.routes.call(hashInfo)
+                hashInfo = $.router.parseHash(hashTag);
+            $.router.routes.search(hashInfo)
         },
     }
-    });
+});
 
-    $(window).bind('hashchange', $.router.hashchangeHandler);
-    $(window).bind('load', $.router.hashchangeHandler);
-}(jQuery));
+$(window).bind('hashchange', $.router.hashHandler);
+$(window).bind('load', $.router.hashHandler);

vifib/index.html

@@ -341,8 +341,8 @@
     <script type="text/javascript" src="static/js/modernizr-2.5.3.js"></script>
     <script type="text/javascript" src="static/js/sinon-1.3.2.js"></script>
     <script type="text/javascript" src="static/js/jquery.slapos.js"></script>
+    <script type="text/javascript" src="static/js/jquery.urljs.js"></script>
     <!--<script type="text/javascript" src="static/js/fake.js"></script>-->
-	<script type="text/javascript" src="static/js/urlHandler.js"></script>
     <script type="text/javascript" src="static/js/core.js"></script>
 </body>
 </html>

vifib/static/js/core.js

@@ -5,31 +5,7 @@
  */
 (function ($) {
     'use strict';
-    var routes = {
-        '/catalog' : 'showCatalog',
-        '/catalog/all' : 'showCatalogAll',
-        '/instance' : 'requestInstance',
-        '/instance/:url' : 'showInstance',
-        '/instance/:url/bang' : 'showBangInstance',
-        '/computers' : 'listComputers',
-        '/instances' : 'listInstances',
-        '/invoices' : 'listInvoices',
-        '/dashboard' : 'showDashboard'
-    },
-        router = function (e, d) {
-            var $this = $(this);
-            $.each(routes, function (pattern, callback) {
-                pattern = pattern.replace(/:\w+/g, '([^\/]+)');
-                var regex = new RegExp('^' + pattern + '$'),
-                    result = regex.exec(d);
-                if (result) {
-                    result.shift();
-                    methods[callback].apply($this, result);
-                }
-            });
-        },
-
-        getDate = function () {
+    var getDate = function () {
             var today = new Date();
             return [today.getFullYear(), today.getMonth(), today.getDay()].join('/') +
                 ' ' + [today.getHours(), today.getMinutes(), today.getSeconds()].join(':');
@@ -83,23 +59,33 @@
         
         methods = {
             init: function () {
+                var routes = [];
+                routes[0] = [
+                    ['/catalog', methods['showCatalog']],
+                    ['/catalog/all', methods['showCatalogAll']],
+                    ['/instance', methods['requestInstance']],
+                    ['/instance/:url', methods['showInstance']],
+                    ['/instance/:url/bang', methods['showBangInstance']],
+                    ['/computers', methods['listComputers']],
+                    ['/instances', methods['listInstances']],
+                    ['/invoices', methods['listInvoices']],
+                    ['/dashboard', methods['showDashboard']]
+                ];
+                return this.each(function () {
                     // Initialize slapos in this context
                     $(this).slapos({'host': 'http://10.8.2.34:12006/erp5/portal_vifib_rest_api_v1'});
-                var $this = $(this);
                     // Bind Loading content
                     $('#loading').ajaxStart(function () {
                         $(this).spin(spinOptions);
                     }).ajaxStop(function () {
                         $(this).spin(false);
                     });
-                // Bind to urlChange event
-                return this.each(function () {
-                    $.subscribe('urlChange', function (e, d) {
-                        router.call($this, e, d);
-                    });
-                    $.subscribe('auth', function (e, d) {
-                        $(this).vifib('authenticate', d);
-                    });
+                    for (var level = 0; level < routes.length; level += 1) {
+                        for (var i = 0; i < routes[level].length; i += 1) {
+                            var r = routes[level][i];
+                            $.router.routes.add(r[0], level, r[1], $(this));
+                        }
+                    }
                 });
             },
 

vifib/static/js/urlHandler.js

@@ -61,5 +61,7 @@ $.redirectHandler = function(e, url){ window.location.hash = $.genHash(url); };
 $.redirect = function(url){ $.publish('redirect', [url]); };
 $.subscribe('redirect', $.redirectHandler)
 
+console.log("plop")
+
 $(window).bind('hashchange', $.hashHandler);
 $(window).bind('load', $.hashHandler);