Browse Source

adaptiveLayout true by default, but can be disabled

Maxim Sokhatsky 11 years ago
parent
commit
1fe6af20f2

+ 9 - 11
apps/web/priv/static/app/js/bootloader.js

@@ -124,15 +124,14 @@ function PatchSVG()
 
     if (currentLanguage() != "en") $("#Flag-en").hide();
 
-    localStorage.setItem("adaptiveDesign","true");
 
     translateScene();
 
     initDiscards();
     initChat();
     initChatSample();
-    initEditorsSafari();
     initPauseOverlay();
+    initEditorsSafari();
 
     if ((hours() < 6 || hours() >= 18)) {
         $("#Sky").attr({fill:"#0E4B69"});
@@ -338,10 +337,16 @@ function showRevealHand(o) {
          ];
 
 globalShiftX = 0;
-globalRightPosition = 0;
+globalRightPosition = 857;
+
 
 appRun();
 
+if (adaptiveDesign())
+{
+    $(window).on("orientationchange", relayout);
+    $(window).on("resize", relayout);
+}
 
 function manualForeignObjectPositioning()
 {
@@ -432,7 +437,7 @@ function relayout()
         barHover();
         mouseWheelHandler({'detail':0,'wheelDelta':0});
         barHoverOut();
-        
+
         if (!isSafari()) {
             $("#GameChatEditor").attr({x: 10+rightPosition});
             $("#OnlineChatEditor").attr({x: 10-globalShiftX});
@@ -450,10 +455,3 @@ function relayout()
 }
 
 
-if (adaptiveDesign())
-{
-    $(window).on("orientationchange", relayout);
-    $(window).on("resize", relayout);
-    relayout();
-}
-

+ 1 - 0
apps/web/priv/static/app/js/okey/okey.js

@@ -3,6 +3,7 @@ function StartApp() { $.load(scope.CARD_SOURCE, PostLoad); }
 
 function PostLoad()
 {
+    if (adaptiveDesign()) relayout();
 
     rightFlag = 1;
     leftFlag = 1;

+ 7 - 2
apps/web/priv/static/app/js/selector.js

@@ -16,10 +16,15 @@ var scope = {
     FEMALE_SKINS: [ "Alina" ],
     paused: false,
     fixedChatBars: true,
-    version: 2306201401
+    version: 2506201401
 };
 
-function adaptiveDesign() { return localStorage.getItem("adaptiveDesign"); }
+function adaptiveDesign() {
+    var yes = "true";
+    var itemName = "adaptiveLayout";
+    var item = localStorage.getItem(itemName);
+    var value = null == item ? (localStorage.setItem(itemName,yes),yes) : item;
+    return value == yes; }
 
 var $ = function(_undefind)
 {