Merge branch 'release/4.3.1'

Schlaefer · Sep 28, 2014 · 6131fa9 · 6131fa9
2 parents 549f9f2 + f00a840
commit 6131fa9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/app/Config/version.php b/app/Config/version.php
@@ -1,4 +1,4 @@
 <?php
-	Configure::write('Saito.v', '4.3.0');
+	Configure::write('Saito.v', '4.3.1');
 
 	Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');
diff --git a/app/webroot/dist/common.min.js b/app/webroot/dist/common.min.js
diff --git a/app/webroot/dist/main.min.js b/app/webroot/dist/main.min.js
diff --git a/app/webroot/js/main.js b/app/webroot/js/main.js
@@ -8,6 +8,8 @@ require.config({
 
     templateHelpers: 'lib/saito/templateHelpers'
   }
+  // force disable cache for require.js resources (esp. mobile spielzeugbrowser)
+  // urlArgs: 'token=' + (new Date()).getTime()
 });
 
 // fallback if dom does not get ready for some reason to show the content eventually

diff --git a/app/webroot/js/views/answering.js b/app/webroot/js/views/answering.js
@@ -187,6 +187,12 @@ define([
     },
 
     _focusSubject: function() {
+      // focus is broken in Mobile Safari iOS 8
+      var iOS =  window.navigator.appVersion.match('iPad|iPhone');
+      if (iOS) {
+        return;
+      }
+
       this.$('.postingform input[type=text]:first').focus();
     },