From 0985605a8ef923a5cf7280c1f0115a23efb3ac0a Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Sat, 14 Dec 2013 22:44:59 +0000
Subject: [PATCH] Prepare release

---
 public/res/constants.js            |  8 --------
 public/res/core.js                 |  4 +++-
 public/res/helpers/googleHelper.js | 10 +++++++++-
 public/res/styles/base.less        | 12 ++++++------
 public/res/styles/main.less        |  7 +++++++
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/public/res/constants.js b/public/res/constants.js
index 9e13a8ef..6e3e353d 100644
--- a/public/res/constants.js
+++ b/public/res/constants.js
@@ -27,14 +27,6 @@ define([], function() {
     constants.SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/";
     constants.HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/";
     
-    // Use by Google's client.js
-    window.delayedFunction = undefined;
-    window.runDelayedFunction = function() {
-        if(window.delayedFunction !== undefined) {
-            window.delayedFunction();
-        }
-    };
-    
     // Site dependent
     constants.BASE_URL = "http://localhost/";
     constants.GOOGLE_CLIENT_ID = '241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com';
diff --git a/public/res/core.js b/public/res/core.js
index 0ebc14fe..1ee715aa 100644
--- a/public/res/core.js
+++ b/public/res/core.js
@@ -53,7 +53,7 @@ define([
         }
         return userActive && windowUnique;
     }
-
+    
     // Used to only have 1 window of the application in the same browser
     var windowId;
     function checkWindowUnique() {
@@ -72,6 +72,8 @@ define([
             }
             $(".modal").modal("hide");
             $('.modal-non-unique').modal("show");
+            // Attempt to close the window
+            window.close();
         }
     }
 
diff --git a/public/res/helpers/googleHelper.js b/public/res/helpers/googleHelper.js
index a5323237..5864d083 100644
--- a/public/res/helpers/googleHelper.js
+++ b/public/res/helpers/googleHelper.js
@@ -840,6 +840,14 @@ define([
         });
         task.enqueue();
     };
-
+    
+    // Use by Google's client.js
+    window.delayedFunction = undefined;
+    window.runDelayedFunction = function() {
+        if(window.delayedFunction !== undefined) {
+            window.delayedFunction();
+        }
+    };
+    
     return googleHelper;
 });
diff --git a/public/res/styles/base.less b/public/res/styles/base.less
index a9ab0a4b..8da64c51 100644
--- a/public/res/styles/base.less
+++ b/public/res/styles/base.less
@@ -18,37 +18,37 @@
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 300;
-    src: local('Open Sans Light'), local('OpenSans-Light'), url('../font/opensans-light-webfont.svg#open_sanslight') format('svg'), url("../font/opensans-light-webfont.woff") format('woff');
+    src: local('Open Sans Light'), local('OpenSans-Light'), url("../font/opensans-light-webfont.woff") format('woff');
 }
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 400;
-    src: local('Open Sans'), local('OpenSans'), url('../font/opensans-regular-webfont.svg#open_sansregular') format('svg'), url("../font/opensans-regular-webfont.woff") format('woff');
+    src: local('Open Sans'), local('OpenSans'), url("../font/opensans-regular-webfont.woff") format('woff');
 }
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 700;
-    src: local('Open Sans Bold'), local('OpenSans-Bold'), url('../font/opensans-bold-webfont.svg#open_sansbold') format('svg'), url("../font/opensans-bold-webfont.woff") format('woff');
+    src: local('Open Sans Bold'), local('OpenSans-Bold'), url("../font/opensans-bold-webfont.woff") format('woff');
 }
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 300;
-    src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('../font/opensans-lightitalic-webfont.svg#open_sanslight_italic') format('svg'), url("../font/opensans-lightitalic-webfont.woff") format('woff');
+    src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url("../font/opensans-lightitalic-webfont.woff") format('woff');
 }
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 400;
-    src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../font/opensans-italic-webfont.svg#open_sansitalic') format('svg'), url("../font/opensans-italic-webfont.woff") format('woff');
+    src: local('Open Sans Italic'), local('OpenSans-Italic'), url("../font/opensans-italic-webfont.woff") format('woff');
 }
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 700;
-    src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('../font/opensans-bolditalic-webfont.svg#open_sansbold_italic') format('svg'), url("../font/opensans-bolditalic-webfont.woff") format('woff');
+    src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url("../font/opensans-bolditalic-webfont.woff") format('woff');
 }
 @media screen and (-webkit-min-device-pixel-ratio:0) {
     @font-face {
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index a75b50bb..02cf4481 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -130,6 +130,13 @@ body {
 	tab-size: 4;
 }
 
+// Bug with SVG font on Windows
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    select {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+}
+
 #preview-contents {
 	padding: 15px;
 	margin: 0 auto 180px;