updated jQuery to version 1.9.1

diff --git a/package.json b/package.json
index 73c53fd74134ec394dc0a993f93288ebfeab9617..1022196e933b78c009d208c9174ffe616137b066 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,5 +24,5 @@
     "start": "node app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.5-11"
+  "version": "0.3.5-12"
 }

diff --git a/public/js/app.js b/public/js/app.js
index d1d7df1ac615245c1b75dc9aaca9007374120c11..4017f6b73e89465c6af371535ff103480c4ea243 100644 (file)
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -957,14 +957,12 @@
   setVariables();
   DOM.modal.modal({keyboard:false, show:false, backdrop:'static'});
   DOM.togglechat.click(hideChat);
-  if ($.browser.mozilla) {
-    // Block ESC button in firefox (breaks socket connections)
-    $(document).keypress(function(event) {
-      if(event.keyCode === 27) {
-        return false;
-      }
-    });
-  }
+  // Prevent Firefox from closing the websocket connection if the ESC key is pressed
+  $(document).keydown(function(e) {
+    if (e.keyCode === 27) {
+      e.preventDefault();
+    }
+  });
   socket = io.connect(uri, {'reconnect':false});
   socket.on('connect', function() {
     jplayer = $('#player').jPlayer({

diff --git a/public/js/home.js b/public/js/home.js
index e1c9083f394839f0b3446728077bc11bbe9690f6..98c56ee8d23b50b8901fdab9b87e59136c4cb5ec 100644 (file)
--- a/public/js/home.js
+++ b/public/js/home.js
@@ -1,12 +1,10 @@
 (function() {
-  if ($.browser.mozilla) {
-    // Block ESC button in firefox (breaks socket connections).
-    $(document).keypress(function(event) {
-      if(event.keyCode === 27) {
-        return false;
-      }
-    });
-  }
+  // Prevent Firefox from closing the websocket connection if the ESC key is pressed
+  $(document).keydown(function(e) {
+    if (e.keyCode === 27) {
+      e.preventDefault();
+    }
+  });
   $.get('/artworks', function(data) {
     $('.thumbnail').each(function(index) {
       var i = index * 6;

diff --git a/views/layout.jade b/views/layout.jade
index 3f780ffd4c50b55b3d514a742cecd9e54e47ca1b..293ed1283ddf8b988796fe420fb6bd0fc8945c4a 100644 (file)
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -48,7 +48,7 @@ html
           span.footer-info Powered by 
     block media
     block scripts
-      script(src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js")
+      script(src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js")
       script(src="/static/js/bootstrap.min.js")
     script
       var uvOptions = {};

diff --git a/views/leaderboards.jade b/views/leaderboards.jade
index 53b78999568838c72331c3677ca19fa1fbfae5b7..b73a8d3faed3fd713ee0236051a50277f3394543 100644 (file)
--- a/views/leaderboards.jade
+++ b/views/leaderboards.jade
@@ -49,5 +49,5 @@ block sections
             .loading-block
 
 block scripts
-  script(src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js")
+  script(src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js")
   script(src="/static/js/leaderboards.js")