proxy safari and msie 7/8/9; remove trailing commas form language files

config.json

@@ -39,6 +39,10 @@
                 "src": "source",
                 "dst": "build",
                 "regex": "(css/.*|img/.*|.*\\.(ico|html)|gfx/.*\\.(png|jpg|gif))$"
+            },
+            {  
+                "src": "libs/json2.min.js",
+                "dst": "build/js/json2.min.js"
             }
         ],
         // compile less files

source/embed/index.html

@@ -13,6 +13,9 @@
 <!-- build:js ../js/storymap-min.js -->
 <script type="text/javascript" src="/build/js/storymap.js"></script>
 <!-- endbuild -->
+<!-- build:js ../js/json2.min.js -->
+<script type="text/javascript" src="/build/js/json2.min.js"></script>
+<!-- endbuild -->
 <style>
 html, body {
     width: 100%;
@@ -93,12 +96,19 @@
 var params = parseQuerystring();
 var storymap_url = decodeURIComponent(params['url']);
 
-// proxy?
-/*
-if(storymap_url.match(/www\.googledrive\.com\/host\//)) {
-    storymap_url = 'http://proxy.knightlab.com/'+storymap_url.split('://')[1];
+// proxy safari and IE9
+trace(navigator.userAgent);
+trace(!!navigator.userAgent.match(/Version\/[\d\.]+.*Safari/));
+trace(!!navigator.userAgent.toLowerCase().match(/msie [789]/));
+
+if(!!navigator.userAgent.match(/Version\/[\d\.]+.*Safari/)
+|| !!navigator.userAgent.toLowerCase().match(/msie [789]/)) {    
+    if(storymap_url.match(/^https?:\/\/www\.googledrive\.com\/host\//)) {
+        storymap_url = location.protocol+'//proxy.knightlab.com/'+storymap_url.split('://')[1];
+        trace('proxy, '+storymap_url);
+    }
 }
-*/
+
 var options = {
     script_path: getScriptPath(/storymap(-min)?\.js/),
     start_at_slide: 0,
@@ -163,7 +173,9 @@
         xdr.onload = function() {
             storymap_onload(JSON.parse(xdr.responseText));
         };
-        xdr.onerror = function() { /* doit */ };
+        xdr.onerror = function() { 
+            trace('embed: error loading data via XDomainRequest'); 
+        };
         xdr.onprogress = function() {};
         xdr.open("get", storymap_url);
         xdr.send();

source/js/language/VCO.Language.js

@@ -3,7 +3,7 @@ VCO.Language = {
 	lang: 					"en",
 	messages: {
 		loading: 			"Loading",
-		wikipedia: 			"From Wikipedia, the free encyclopedia",
+		wikipedia: 			"From Wikipedia, the free encyclopedia"
 	},
 	buttons: {
 	    map_overview: 		"Map Overview",

source/js/language/locale/de.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "de",
     messages: {
         loading: "Daten werden geladen",
-        wikipedia: "von Wikipedia, der freien Enzyklopädie",
+        wikipedia: "von Wikipedia, der freien Enzyklopädie"
     },
     buttons: {
         map_overview:      "Kartenübersicht",

source/js/language/locale/es.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "es",
     messages: {
         loading: "cargando",
-        wikipedia: "de Wikipedia, la enciclopedia libre",
+        wikipedia: "de Wikipedia, la enciclopedia libre"
     },
     buttons: {
         map_overview:      "vista general del mapa",

source/js/language/locale/fr.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "fr",
     messages: {
         loading: "Chargement",
-        wikipedia: "Extrait de Wikipédia, l'encyclopédie libre",
+        wikipedia: "Extrait de Wikipédia, l'encyclopédie libre"
     },
     buttons: {
         map_overview:      "Vue d'ensemble de la carte",

source/js/language/locale/it.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "it",
     messages: {
         loading: "caricare",
-        wikipedia: "da Wikipedia, la enciclopedia libera",
+        wikipedia: "da Wikipedia, la enciclopedia libera"
     },
     buttons: {
         map_overview:      "vista generale della mappa",

source/js/language/locale/jp.js

@@ -3,7 +3,7 @@ VCO.Language = {
   lang: "jp",
   messages: {
     loading: "ローディング",
-    wikipedia: "フリー百科事典ウィキペディア（Wikipedia）から",
+    wikipedia: "フリー百科事典ウィキペディア（Wikipedia）から"
   },
   buttons: {
     map_overview: "概観地図",

source/js/language/locale/no.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "no",
     messages: {
         loading: "Laster inn",
-        wikipedia: "fra Wikipedia, den frie encyklopedi",
+        wikipedia: "fra Wikipedia, den frie encyklopedi"
     },
     buttons: {
         map_overview:      "Se oversiktskart",

source/js/language/locale/pl.js

@@ -3,7 +3,7 @@ VCO.Language = {
     lang: "pl",
     messages: {
         loading: "Wczytuję",
-        wikipedia: "z Wikipedii, wolnej encyklopedii",
+        wikipedia: "z Wikipedii, wolnej encyklopedii"
     },
     buttons: {
         map_overview: "Przeglądaj mapę",

source/js/language/locale/sr.js

@@ -3,7 +3,7 @@
     lang: "sr",
     messages: {
         loading: "Učitavanje",
-        wikipedia: "Wikipedia",
+        wikipedia: "Wikipedia"
     },
     buttons: {
         map_overview: "Pregled mapę",

source/js/language/locale/sv.js

@@ -3,7 +3,7 @@ VCO.Language = {
   lang: "sv",
   messages: {
     loading: "Laddar",
-    wikipedia: "Från Wikipedia, den fria encyklopedin",
+    wikipedia: "Från Wikipedia, den fria encyklopedin"
   },
   buttons: {
     map_overview: "Översiktskarta",

source/js/language/locale/zh-cn.js

@@ -3,7 +3,7 @@ VCO.Language = {
 	lang: 					"zh-cn",
 	messages: {
 		loading: 			"加载中",
-		wikipedia: 			"来自维基百科，自由的百科全书",
+		wikipedia: 			"来自维基百科，自由的百科全书"
 	},
 	buttons: {
 	    map_overview: 		"地图总览",

source/js/language/locale/zh-tw.js

@@ -3,7 +3,7 @@ VCO.Language = {
 	lang: 					"zh-tw",
 	messages: {
 		loading: 			"載入中",
-		wikipedia: 			"來自維基百科，自由的百科全書",
+		wikipedia: 			"來自維基百科，自由的百科全書"
 	},
 	buttons: {
 	    map_overview: 		"地圖總覽",