Merge branch 'dev' of https://github.com/Tour-360/tour-player into dev

example/manifest.json

@@ -1,5 +1,5 @@
+// specification: https://github.com/Tour-360/tour-player/wiki/Формат-файла-Data.json
 {
-	"_specification": "https://github.com/Tour-360/tour-player/wiki/Формат-файла-Data.json",
 	"title": "Avant SHOP",
 	"start": 1,
 	"backgroundImage": "data:image/gif;base64,R0lGODdhCAAGAPIAAOjt86O4sp2np0tbTJKNi46gqLyyvcHK0iwAAAAACAAGAAADGhgGdxwiyFDEGaIckQ0mhtENhEBsFqFajJEAADs=",

package.json

@@ -2,16 +2,15 @@
   "name": "tour-player",
   "version": "2.0.0",
   "description": "",
-  "repository": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Tour-360/tour-player"
+  },
   "scripts": {
     "postinstall": "./node_modules/bower/bin/bower i && ./node_modules/gulp/bin/gulp.js build",
     "start": "node index.js",
     "test": "gulp lint"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Tour-360/tour-player"
-  },
   "keywords": [
     "tour",
     "virtual",
@@ -23,13 +22,14 @@
   "author": "Maxim Borodin <[email protected]> (http://maximborodin.ru)",
   "contributors": [
     {
-      "name" : "Maxim Borodin",
-      "email" : "[email protected]",
-      "url" : "http://maximborodin.ru"
-    },{
-      "name" : "Denis Borodin",
-      "email" : "[email protected]",
-      "url" : "http://denisborodin.ru"
+      "name": "Maxim Borodin",
+      "email": "[email protected]",
+      "url": "http://maximborodin.ru"
+    },
+    {
+      "name": "Denis Borodin",
+      "email": "[email protected]",
+      "url": "http://denisborodin.ru"
     }
   ],
   "license": "MIT",

src/js/Tour/addEventListeners.js

@@ -20,5 +20,4 @@ Tour.addEventListeners = function() {
     window.addEventListener('resize',  this.resize.bind(this));
 
     window.addEventListener('popstate', Tour.history.onpopstate);
-    window.addEventListener('error', Tour.report);
 };

src/js/Tour/defaultOption.js

@@ -16,6 +16,9 @@ Tour.defaultOption = {
     touchScroll: false,
     scaleControl: true,
     autorotationAlign: true,
+    sentry: {
+        dsn: 'https://[email protected]/1309149'
+    },
     limit: {
         fov: { min: 20, max: 90},
         lat: { min: -85, max: 85},

src/js/Tour/dictionary.js

@@ -185,5 +185,12 @@ Tour.dictionary = {
         'uk': 'Помилка завантаження віртуального туру',
         'de': 'Fehler beim Laden Virtuelle Tour',
         'zh': '错误加载虚拟旅游'
+    },
+    'notification.error-load-tour-protocol': {
+        'en': 'Loading error. Use the http or https protocol for correct tour operation',
+        'ru': 'Ошибка загрузки. Используйте протокол http или https для корректной работы тура',
+        'uk': 'Помилка завантаження. Використовуйте протокол http або https для коректної роботи туру',
+        'de': 'Ladefehler. Verwenden Sie das http- oder https-Protokoll für den korrekten Tour-Vorgang',
+        'zh': '加载错误。 使用http或https协议进行正确的巡视操作'
     }
 };

src/js/Tour/load.js

@@ -13,10 +13,17 @@ Tour.load = function(data, callback) {
                 return;
             }
             if (xhr.status != 200) {
-                UI.notification.show(Lang.get('notification.error-load-tour'), false);
+                var errorText
+                if(xhr.status == 0 || window.location.protocol == 'file:'){
+                    errorText = Lang.get('notification.error-load-tour-protocol');
+                }else{
+                    errorText = Lang.get('notification.error-load-tour');
+                }
+                UI.notification.show(errorText, false);
             } else {
                 try {
-                    Tour.data = JSON.parse(xhr.responseText);
+                    var json = xhr.responseText.replace(/\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/mg, '');
+                    Tour.data = JSON.parse(json);
                     callback(Tour.data);
                     Tour.emmit('load', Tour.data);
                 } catch (e) {

src/js/Tour/sentry.js

@@ -0,0 +1,12 @@
+/* globals Tour */
+
+Tour.sentry = function() {
+    var script = document.createElement('script');
+    script.src = 'https://browser.sentry-cdn.com/4.2.2/bundle.min.js';
+    script.crossorigin = "anonymous";
+    document.getElementsByTagName('head')[0].appendChild(script);
+
+    script.onload = function() {
+        Sentry.init(Tour.options.sentry);
+    }
+};