Upgrades deps.

public/index.html

@@ -14,12 +14,12 @@
     <script type="text/javascript" src="libs/jquery/1.7.2/jquery.js" data-remote="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
     <script type="text/javascript" src="libs/jsgettext/0.08/Gettext.js"></script>
     <script type="text/javascript" src="libs/json2/20110223/json2.js" data-remote="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.min.js"></script>
-    <script type="text/javascript" src="libs/obviel/1.0b3/obviel-i18n.js"></script>
-    <script type="text/javascript" src="libs/obviel/1.0b3/obviel-template.js"></script>
-    <script type="text/javascript" src="libs/obviel/1.0b3/obviel.js"></script>
-    <script type="text/javascript" src="libs/obviel/1.0b3/obviel-forms.js"></script>
+    <script type="text/javascript" src="libs/obviel/1.0b5/obviel-i18n.js"></script>
+    <script type="text/javascript" src="libs/obviel/1.0b5/obviel-template.js"></script>
+    <script type="text/javascript" src="libs/obviel/1.0b5/obviel.js"></script>
+    <script type="text/javascript" src="libs/obviel/1.0b5/obviel-forms.js"></script>
     <script type="text/javascript" src="libs/less.js/1.3.1/less.js" data-drop=""></script>
-    <script type="text/javascript" src="libs/socket.io/0.9.10/socket.io.js" data-remote="//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js"></script>
+    <script type="text/javascript" src="libs/socket.io/0.9.11/socket.io.js" data-remote="//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.11/socket.io.min.js"></script>
 
     <!-- Modules -->
     <script type="text/javascript" src="js/twist.js"></script>

public/libs/obviel/1.0b3/obviel-forms-autocomplete.js → public/libs/obviel/1.0b5/obviel-forms-autocomplete.js

@@ -76,12 +76,8 @@
                             labels.push(item.label);
                         });
                         autocompleteCallback(labels);
-                    },
-                    error: function(xhr, status, error) {
-                        // XXX must always call autocomplete callback
-                        // even when there's an error?
                     }
-                });
+                }).fail(self.registry.httpErrorHook);
             };
         } else if (autocompleteData.length &&
                    typeof autocompleteData[0] !== 'string') {
@@ -113,7 +109,7 @@
             // a change explicitly so we can report errors
             inputEl.val(cloneEl.val());
             var changeEv = $.Event('change');
-            changeEv.target = inputEl;
+            changeEv.target = inputEl.get(0);
             inputEl.trigger(changeEv);
         };
         cloneEl.autocomplete(autocompleteOptions);
@@ -126,7 +122,7 @@
             }
             inputEl.val(cloneEl.val());
             var changeEv = $.Event('change');
-            changeEv.target = inputEl;
+            changeEv.target = inputEl.get(0);
             inputEl.trigger(changeEv);
         });
     };

public/libs/obviel/1.0b3/obviel-forms.js → public/libs/obviel/1.0b5/obviel-forms.js

@@ -383,6 +383,11 @@ obviel.forms = {};
             var formEl = $('form', self.el);
             formEl.trigger('form-change.obviel');
         });
+
+        defer.fail(function(xhr) {
+            self.registry.httpErrorHook(xhr);
+        });
+
         return defer;
     };
 
@@ -515,7 +520,7 @@ obviel.forms = {};
 
     module.Widget.prototype.renderErrorArea = function() {
         $('.obviel-field-input', this.el).append(
-            '<span class="obviel-error-area help-inline"></div>');
+            '<span class="obviel-error-area help-inline"></span>');
 
         $('.obviel-error-area', this.el).render(
             {iface: 'obvielFormsErrorArea',

public/libs/obviel/1.0b3/obviel.js → public/libs/obviel/1.0b5/obviel.js

@@ -1,4 +1,4 @@
-/*global jsontemplate:false */
+/*global jsontemplate:false alert:false */
 
 if (typeof obviel === "undefined") {
     var obviel = {};
@@ -347,7 +347,12 @@ if (typeof console === "undefined") {
                     self.finalize();
                     self.defer.resolve(self);
                 });
+                subviewsPromise.fail(function() {
+                    self.defer.reject(self);
+                });
             });
+        }).fail(function() {
+            self.defer.reject(self);
         });
     };
 
@@ -535,12 +540,16 @@ if (typeof console === "undefined") {
 
     var nullEventHook = function() {
     };
+
+    var nullHttpErrorHook = function(jqXHR) {
+    };
 
     module.Registry = function() {
         this.views = {};
         /* the default transformer doesn't do anything */
         this.transformerHook = nullTransformer;
         this.eventHook = nullEventHook;
+        this.httpErrorHook = nullHttpErrorHook;
     };
 
     module.Registry.prototype.register = function(view) {
@@ -638,6 +647,9 @@ if (typeof console === "undefined") {
             var view = self.cloneView(el, obj, name, defer);
             view.fromUrl = url;
             return view;
+        }).fail(function(xhr) {
+            self.httpErrorHook(xhr);
+            defer.reject(xhr);
         });
     };
 
@@ -654,6 +666,13 @@ if (typeof console === "undefined") {
         }
         this.eventHook = eventHook;
     };
+
+    module.Registry.prototype.registerHttpErrorHook = function(hook) {
+        if (hook === null || hook === undefined) {
+            hook = nullHttpErrorHook;
+        }
+        this.httpErrorHook = hook;
+    };
 
     module.registry = new module.Registry();
 
@@ -993,6 +1012,10 @@ if (typeof console === "undefined") {
     module.eventHook = function(eventHook) {
         module.registry.registerEventHook(eventHook);
     };
+
+    module.httpErrorHook = function(hook) {
+        module.registry.registerHttpErrorHook(hook);
+    };
 
     $.fn.render = function(obj, name) {
         // if we have no name argument, we set it to default

public/libs/socket.io/0.9.10/socket.io.js → public/libs/socket.io/0.9.11/socket.io.js

@@ -1,4 +1,4 @@
-/*! Socket.IO.js build:0.9.10, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
+/*! Socket.IO.js build:0.9.11, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
 
 var io = ('undefined' === typeof module ? {} : module.exports);
 (function() {
@@ -25,7 +25,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
    * @api public
    */
 
-  io.version = '0.9.10';
+  io.version = '0.9.11';
 
   /**
    * Protocol implemented.
@@ -262,7 +262,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
 
   util.request = function (xdomain) {
 
-    if (xdomain && 'undefined' != typeof XDomainRequest) {
+    if (xdomain && 'undefined' != typeof XDomainRequest && !util.ua.hasCORS) {
       return new XDomainRequest();
     }
 
@@ -318,7 +318,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
    *
    * @api public
    */
-  
+
   util.merge = function merge (target, additional, deep, lastseen) {
     var seen = lastseen || []
       , depth = typeof deep == 'undefined' ? 2 : deep
@@ -343,7 +343,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
    *
    * @api public
    */
-  
+
   util.mixin = function (ctor, ctor2) {
     util.merge(ctor.prototype, ctor2.prototype);
   };
@@ -391,7 +391,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
     }
 
     return ret;
-  }
+  };
 
   /**
    * Array indexOf compatibility.
@@ -401,8 +401,8 @@ var io = ('undefined' === typeof module ? {} : module.exports);
    */
 
   util.indexOf = function (arr, o, i) {
-    
-    for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0; 
+
+    for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0;
          i < j && arr[i] !== o; i++) {}
 
     return j <= i ? -1 : i;
@@ -667,7 +667,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
     return exports.JSON = {
       parse: nativeJSON.parse
     , stringify: nativeJSON.stringify
-    }
+    };
   }
 
   var JSON = exports.JSON = {};
@@ -1273,7 +1273,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
 
   Transport.prototype.heartbeats = function () {
     return true;
-  }
+  };
 
   /**
    * Handles the response from the server. When a new response is received
@@ -1286,8 +1286,8 @@ var io = ('undefined' === typeof module ? {} : module.exports);
 
   Transport.prototype.onData = function (data) {
     this.clearCloseTimeout();
-    
-    // If the connection in currently open (or in a reopening state) reset the close 
+
+    // If the connection in currently open (or in a reopening state) reset the close
     // timeout since we have just received data. This check is necessary so
     // that we don't reset the timeout on an explicitly disconnected connection.
     if (this.socket.connected || this.socket.connecting || this.socket.reconnecting) {
@@ -1339,7 +1339,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
    *
    * @api private
    */
-  
+
   Transport.prototype.setCloseTimeout = function () {
     if (!this.closeTimeout) {
       var self = this;
@@ -1372,7 +1372,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
   Transport.prototype.onConnect = function () {
     this.socket.onConnect();
     return this;
-  }
+  };
 
   /**
    * Clears close timeout
@@ -1423,7 +1423,7 @@ var io = ('undefined' === typeof module ? {} : module.exports);
   Transport.prototype.onHeartbeat = function (heartbeat) {
     this.packet({ type: 'heartbeat' });
   };
- 
+
   /**
    * Called when the transport opens.
    *
@@ -3235,7 +3235,7 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
       var request = io.util.request(xdomain),
           usesXDomReq = (global.XDomainRequest && request instanceof XDomainRequest),
           socketProtocol = (socket && socket.options && socket.options.secure ? 'https:' : 'http:'),
-          isXProtocol = (socketProtocol != global.location.protocol);
+          isXProtocol = (global.location && socketProtocol != global.location.protocol);
       if (request && !(usesXDomReq && isXProtocol)) {
         return true;
       }
@@ -3532,12 +3532,18 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
     function onload () {
       this.onload = empty;
       this.onerror = empty;
+      self.retryCounter = 1;
       self.onData(this.responseText);
       self.get();
     };
 
     function onerror () {
-      self.onClose();
+      self.retryCounter ++;
+      if(!self.retryCounter || self.retryCounter > 3) {
+        self.onClose();  
+      } else {
+        self.get();
+      }
     };
 
     this.xhr = this.request();
@@ -3751,7 +3757,7 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
 
     this.socket.setBuffer(true);
   };
-  
+
   /**
    * Creates a new JSONP poll that can be used to listen
    * for messages from the Socket.IO server.
@@ -3778,7 +3784,7 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
       self.onClose();
     };
 
-    var insertAt = document.getElementsByTagName('script')[0]
+    var insertAt = document.getElementsByTagName('script')[0];
     insertAt.parentNode.insertBefore(script, insertAt);
     this.script = script;
 
@@ -3859,4 +3865,7 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
   , this
 );
 
+if (typeof define === "function" && define.amd) {
+  define([], function () { return io; });
+}
 })();