merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -56,6 +56,24 @@

            return appStorage.getItem('externalplayers') == 'true';
        },
+        enableCinemaMode: function (val) {
+
+            if (val != null) {
+                update('enableCinemaMode', val.toString());
+            }
+
+            val = appStorage.getItem('enableCinemaMode');
+
+            if (val) {
+                return val != 'false';
+            }
+
+            if (browserInfo.mobile) {
+                return false;
+            }
+
+            return true;
+        },
        enableFullScreen: function (val) {

            if (val != null) {
@@ -95,7 +113,7 @@
                update('displayLanguage', val);
            }

-            return appStorage.getItem('displayLanguage') || 'en-US';
+            return appStorage.getItem('displayLanguage') || navigator.language || navigator.userLanguage || 'en-US';
        },

        cameraUploadServers: function (val) {