Merge pull request #1297 from /issues/1294@v4

Wrong user-scalable value in meta name=viewport
bem · Apr 5, 2016 · 972e49d · 972e49d
2 parents 13ed0d9 + 913aab9
commit 972e49d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/touch.blocks/page/page.bemhtml b/touch.blocks/page/page.bemhtml
@@ -14,7 +14,7 @@ block('page')(
                     content : 'width=device-width,' +
                         (this._zoom?
                             'initial-scale=1' :
-                            'maximum-scale=1,initial-scale=1,user-scalable=0')
+                            'maximum-scale=1,initial-scale=1,user-scalable=no')
                 }
             },
             { elem : 'meta', attrs : { name : 'format-detection', content : 'telephone=no' } },

diff --git a/touch.blocks/page/page.bh.js b/touch.blocks/page/page.bh.js
@@ -17,7 +17,7 @@ module.exports = function(bh) {
                         content : 'width=device-width,' +
                             (ctx.tParam('zoom')?
                                 'initial-scale=1' :
-                                'maximum-scale=1,initial-scale=1,user-scalable=0')
+                                'maximum-scale=1,initial-scale=1,user-scalable=no')
                     }
                 },
                 { elem : 'meta', attrs : { name : 'format-detection', content : 'telephone=no' } },

diff --git a/touch.blocks/page/page.tmpl-specs/00-empty.html b/touch.blocks/page/page.tmpl-specs/00-empty.html
@@ -7,7 +7,7 @@
     <script>
         (function(e,c){e[c]=e[c].replace(/(ua_js_)no/g,"$1yes");})(document.documentElement,"className");
     </script>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/10-simple.html b/touch.blocks/page/page.tmpl-specs/10-simple.html
@@ -11,7 +11,7 @@
     <script src="_10-simple.js"></script>
     <meta name="keywords" content="BEM"/>
     <link rel="shortcut icon" href="//bem.info/favicon.ico"/>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/20-style.html b/touch.blocks/page/page.tmpl-specs/20-style.html
@@ -8,7 +8,7 @@
         (function(e,c){e[c]=e[c].replace(/(ua_js_)no/g,"$1yes");})(document.documentElement,"className");
     </script>
     <style>.b-blah { color: #f00 }</style>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/25-styles.html b/touch.blocks/page/page.tmpl-specs/25-styles.html
@@ -9,7 +9,7 @@
     </script>
     <style>.b-blah { color: red }</style>
     <style>.b-blah2 { color: green }</style>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/30-scripts.html b/touch.blocks/page/page.tmpl-specs/30-scripts.html
@@ -7,7 +7,7 @@
     <script>
         (function(e,c){e[c]=e[c].replace(/(ua_js_)no/g,"$1yes");})(document.documentElement,"className");
     </script>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/40-nonce.html b/touch.blocks/page/page.tmpl-specs/40-nonce.html
@@ -7,7 +7,7 @@
     <script nonce="123">
         (function(e,c){e[c]=e[c].replace(/(ua_js_)no/g,"$1yes");})(document.documentElement,"className");
     </script>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>

diff --git a/touch.blocks/page/page.tmpl-specs/60-x-ua-compatible.html b/touch.blocks/page/page.tmpl-specs/60-x-ua-compatible.html
@@ -6,7 +6,7 @@
     <script>
         (function(e,c){e[c]=e[c].replace(/(ua_js_)no/g,"$1yes");})(document.documentElement,"className");
     </script>
-    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=0"/>
+    <meta name="viewport" content="width=device-width,maximum-scale=1,initial-scale=1,user-scalable=no"/>
     <meta name="format-detection" content="telephone=no"/>
     <link name="apple-mobile-web-app-capable" content="yes"/>
 </head>