Fix duplicate graphs in Turbolinks previews

genieacs · Aug 7, 2017 · 9237739 · 9237739
1 parent 7e3e7c4
commit 9237739
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/app/views/devices/show.html.erb b/app/views/devices/show.html.erb
@@ -3,16 +3,15 @@ can_edit_parameters = can?(:update, 'devices/parameters')
 content_for :title do 'Device ' + @device['_id'] end
 %>
 <script type="text/javascript">
-var pending = {};
-
 $(function() {
+  clearPending();
+
   var options = {
     valueNames: ['param-path', 'param-value'],
     page: 4000
   };
 
   var featureList = new List('device-params', options);
-  refreshPending();
 });
 </script>
 

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -16,6 +16,10 @@ content_for :title do 'Home' end
 <% end %>
 <script type="text/javascript">
 $(function() {
+  // Skip if Turbolinks preview
+  if (document.documentElement.hasAttribute("data-turbolinks-preview"))
+    return;
+
 <% @graphs.each do |group_name, group_graphs| %>
   <% group_graphs.each do |graph_name, graph| %>
   pieChart("<%= group_name %>_<%= graph_name %>", 200, <%= ActiveSupport::JSON.encode(graph).html_safe %>);

diff --git a/app/views/provisions/_form.html.erb b/app/views/provisions/_form.html.erb
@@ -17,5 +17,11 @@
 <% end %>
 
 <script type="text/javascript">
-CodeMirror.fromTextArea(document.getElementById('script'), {mode: 'javascript', lineNumbers: true});
+$(function() {
+  // Skip if Turbolinks previewلا
+  if (document.documentElement.hasAttribute("data-turbolinks-preview"))
+    return;
+
+  CodeMirror.fromTextArea(document.getElementById("script"), {mode: "javascript", lineNumbers: true});
+});
 </script>
diff --git a/app/views/virtual_parameters/_form.html.erb b/app/views/virtual_parameters/_form.html.erb
@@ -17,5 +17,11 @@
 <% end %>
 
 <script type="text/javascript">
-CodeMirror.fromTextArea(document.getElementById('script'), {mode:  'javascript', lineNumbers: true});
+$(function() {
+  // Skip if Turbolinks preview
+  if (document.documentElement.hasAttribute("data-turbolinks-preview"))
+    return;
+
+  CodeMirror.fromTextArea(document.getElementById("script"), {mode: "javascript", lineNumbers: true});
+});
 </script>