[hotfix] saving as new bugfix

apache · Mar 1, 2016 · eccf9c2 · eccf9c2
1 parent 8b0f2af
commit eccf9c2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js
@@ -21,13 +21,35 @@ require('../vendor/pygments.css');
 require('../node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css');
 
 var slice;
+function prepForm(){
+  var i = 1;
+  // Assigning the right id to form elements in filters
+  $("#filters > div").each(function() {
+    $(this).attr("id", function() {return "flt_" + i;})
+    $(this).find("#flt_col_0")
+    .attr("id", function() {return "flt_col_" + i;})
+    .attr("name", function() {return "flt_col_" + i;});
+    $(this).find("#flt_op_0")
+    .attr("id", function() {return "flt_op_" + i;})
+    .attr("name", function() {return "flt_op_" + i;});
+    $(this).find("#flt_eq_0")
+    .attr("id", function() {return "flt_eq_" + i;})
+    .attr("name", function() {return "flt_eq_" + i;});
+    i++;
+  });
+}
+
+function renderSlice(){
+  prepForm();
+  slice.render();
+}
 
 function initExploreView() {
 
   function druidify(){
     $('div.alert').remove();
     history.pushState({}, document.title, slice.querystring());
-    px.renderSlice();
+    renderSlice();
   }
 
   function get_collapsed_fieldsets(){
@@ -227,7 +249,7 @@ $(document).ready(function() {
   $('.slice').data('slice', slice);
 
   // call vis render method, which issues ajax
-  px.renderSlice();
+  renderSlice();
 
   // make checkbox inputs display as toggles
   $(':checkbox')

diff --git a/panoramix/assets/javascripts/modules/panoramix.js b/panoramix/assets/javascripts/modules/panoramix.js
@@ -240,27 +240,6 @@ var px = (function() {
       console.error("require(", visType, ") failed.");
     }
   }
-  function prepForm(){
-    var i = 1;
-    // Assigning the right id to form elements in filters
-    $("#filters > div").each(function() {
-      $(this).attr("id", function() {return "flt_" + i;})
-      $(this).find("#flt_col_0")
-      .attr("id", function() {return "flt_col_" + i;})
-      .attr("name", function() {return "flt_col_" + i;});
-      $(this).find("#flt_op_0")
-      .attr("id", function() {return "flt_op_" + i;})
-      .attr("name", function() {return "flt_op_" + i;});
-      $(this).find("#flt_eq_0")
-      .attr("id", function() {return "flt_eq_" + i;})
-      .attr("name", function() {return "flt_eq_" + i;});
-      i++;
-    });
-  }
-  function renderSlice(){
-    prepForm();
-    slice.render();
-  }
 
   // Export public functions
   return {
@@ -269,7 +248,6 @@ var px = (function() {
     formatDate: formatDate,
     timeFormatFactory: timeFormatFactory,
     color: color(),
-    renderSlice: renderSlice,
     getParam: getParam,
   }
 })();