Merge "Fix back button on Firefox and Safari" into stable/pike

2 files changed, 25 insertions, 0 deletions

diff --git a/horizon/static/horizon/js/horizon.hacks.js b/horizon/static/horizon/js/horizon.hacks.js
new file mode 100644
index 000000000..d1db9fa93
--- /dev/null
+++ b/horizon/static/horizon/js/horizon.hacks.js
@@ -0,0 +1,24 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Added so that we can break Firefox and Safari bfcache to
+// prevent loading previous page from cache.
+horizon.addInitFunction(function () {
+  $(window).bind('pageshow', function(event) {
+    if (event.originalEvent.persisted) {
+      window.location.reload();
+    }
+  });
+});
+
diff --git a/openstack_dashboard/templates/horizon/_scripts.html b/openstack_dashboard/templates/horizon/_scripts.html
index e528e3e4b..bdf87d98a 100644
--- a/openstack_dashboard/templates/horizon/_scripts.html
+++ b/openstack_dashboard/templates/horizon/_scripts.html
@@ -27,6 +27,7 @@
 <script src='{{ STATIC_URL }}horizon/js/horizon.loader.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/horizon.messages.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/horizon.modals.js'></script>
+<script src='{{ STATIC_URL }}horizon/js/horizon.hacks.js'></script>
 <script type="text/javascript">
   horizon.modals.MODAL_BACKDROP = "{% firstof HORIZON_CONFIG.modal_backdrop 'static' %}";
 </script>