forgeos_core 1.9.1 → 1.9.2

data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/commons.js

@@ -12,9 +12,14 @@ function showObjectsAssociated(){
   });
 }
 
-function get_rails_element_id(element){
-  var id = jQuery(element).attr('id').split('_');
-  return id[id.length-1];
+function get_rails_element_id(element) {
+  var id = jQuery(element).attr('id');
+  if (typeof(id) != 'undefined') {
+    id = id.split('_');
+    return id[id.length-1];
+  } else {
+    return '';
+  }
 }
 
 function get_rails_element_ids(list){

data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/dataTable.js

@@ -163,7 +163,7 @@ function removedataTablesRow(selector){
 function DataTablesDrawCallBack(table) {
   InitCustomSelects();
   showObjectsAssociated();
-  hide_paginate(table);
+  //hide_paginate(table);
   moveDataTablesSearchField();
 }
 
@@ -232,6 +232,7 @@ function update_current_dataTable_source(selector,source){
 }
 
 function hide_paginate(dataTables){
+  console.info(dataTables);
   var pagination = jQuery(dataTables.nPaginateList).parents(':first');
   var pages_number = dataTables.nPaginateList.children.length;
   (pages_number>1) ? pagination.show() : pagination.hide();
@@ -248,7 +249,6 @@ function dataTableSelectRows(selector,callback){
   current_table.fnSettings().sAjaxSource = source + '&ids=' + ids.join(',');
 
   current_table.fnSettings().fnDrawCallback = function(){
-    var current_table = jQuery(this).dataTableInstance();
     var indexes = current_table.fnGetSelectedIndexes();
 
     callback(current_table,indexes);

data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/tinyMCE.js

@@ -16,7 +16,7 @@ function tmceInit(selector){
     mode : 'textareas',
     plugins : "table,fullscreen,paste,media,preview,advimage,curblyadvimage,advlink,contextmenu",
     theme : 'advanced',
-    content_css : "/stylesheets/tinyMCE/styles.css",
+    content_css : "/assets/forgeos/tinyMCE/styles.css",
     convert_urls: 0,
     onchange_callback: function(inst){ jQuery(inst.getElement()).trigger('change'); },
     theme_advanced_buttons1 : "undo,redo,|,pasteword,|,anchor,image,media,|,code,preview,|,removeformat,cleanup",

data/app/assets/javascripts/forgeos/admin/functions/forgeos_core/trees.js

@@ -1,4 +1,4 @@
-function duplicate_category(node, type, parent_id){
+function duplicate_category(node, type, parent_id, base_url){
   var name = extract_category_name(node)
   var children = jQuery(node).children('ul').children('li');
   var parent_node = jQuery(node).parent().parent('li');
@@ -8,12 +8,12 @@ function duplicate_category(node, type, parent_id){
     parent_id = get_rails_element_id(parent_node);
 
   jQuery.ajax({
-    "url": '/admin/categories/create',
+    "url": base_url,
     // update node id and duplicate node children
     "complete": function(request){
       var cat_id = request.responseText;
       jQuery(node).attr('id', 'cageory_' + cat_id);
-      children.each(function(){ duplicate_category(jQuery(this), type, cat_id); });
+      children.each(function(){ duplicate_category(jQuery(this), type, cat_id, base_url); });
 
       jQuery(node).children('a').attr('id', 'link_category_' + cat_id);
       jQuery(node).children('a').children('span').attr('id', 'span_category_' + cat_id);
@@ -36,237 +36,225 @@ function get_category_data(name, type, parent_id) {
 
 // initialise tree theme and callbacks
 function init_category_tree(selector, type, source) {
-  jQuery(selector).tree({
-    data:{
-      type: 'json',
-      opts: {
-        url: source
+  if (jQuery(selector).size() != 0) {
+    var base_url = source.replace('.json','/');
+
+    jQuery(selector).bind('loaded.jstree',function(e, data){
+      jQuery(e.target).find('a').each(function(index,selector){
+        var category_id = get_rails_element_id(jQuery(selector).parent('li'));
+        jQuery(selector).droppable({
+          hoverClass: 'ui-state-hover',
+          drop:function(ev, ui){
+            jQuery.ajax({
+              "data": {element_id:get_rails_element_id(jQuery(ui.draggable)), authenticity_token: encodeURIComponent(window._forgeos_js_vars.token)},
+              "success": function(request){jQuery(ev.target).find('span').html(request);},
+              "type":'post',
+              "url": base_url + category_id + '/add_element'
+            });
+          }
+        });
+      });
+    }).bind('create_node.jstree', function(e, data){
+      var jnode = jQuery(data.rslt.obj);
+      var parent_node = jnode.parent().parent('li');
+      var parent_id;
+      // get parent_id if parent node exists
+      if (parent_node[0] != undefined)
+        parent_id = get_rails_element_id(parent_node);
+
+      jQuery.ajax({
+        "url": base_url,
+        "complete": function(request){
+          var cat_id = request.responseText;
+          jnode.attr('id', 'category_' + cat_id);
+          jnode.children('a').attr('id', 'link_category_' + cat_id);
+          set_category_droppable(cat_id, type);
+
+          if( jQuery(".parent_id_hidden").size() == 0){
+            jQuery(document.body).append('<input type="hidden" id="parent_id_tmp" name="parent_id_tmp" class="parent_id_hidden" value="'+cat_id+'" />');
+          } else {
+            jQuery('#parent_id_tmp').val(cat_id);
+          }
+
+        },
+        "data": get_category_data('New folder', type, parent_id),
+        "dataType": 'text',
+        "type": 'post'
+      });
+    }).bind('rename_node.jstree', function(e, data){
+      var NODE = data.rslt.obj;
+      var cat_id = get_rails_element_id(NODE);
+      jQuery.ajax({
+        "url": base_url + cat_id,
+        "data": {authenticity_token: window._forgeos_js_vars.token, format: 'json', 'category[name]': jQuery(NODE).children('a').text()},
+        "dataType":'text',
+        "type":'put'
+      });
+    }).bind('move_node.jstree', function(e, data){
+      var NODE = data.rslt.obj;
+      var cat_id = get_rails_element_id(NODE);
+      var parent_id = '';
+      var jnode = jQuery(NODE);
+      var parent_ul = jnode.parents('ul:first');
+      var position = jQuery(parent_ul).children('li').index(jnode);
+      var tree_id = jQuery(e.target).attr('id');
+
+      position = position+1;
+      if (jnode.parent().parent('li').length > 0){
+        parent_id = get_rails_element_id(jnode.parent().parent('li'));
       }
-    },
-    plugins: {
-      'contextmenu': {
-        items : {
-          create : {
-            label : "Créer",
-            icon  : "create",
-            visible : function (NODE, TREE_OBJ) {
-              if(NODE.length != 1) return 0;
-              return TREE_OBJ.check("creatable", NODE);
-            },
-            action  : function (NODE, TREE_OBJ) {
-              TREE_OBJ.create(false, TREE_OBJ.get_node(NODE[0]));
+      jQuery.ajax({
+        "url": base_url + cat_id,
+        "data": { authenticity_token: window._forgeos_js_vars.token, format: 'json', 'categories_hash': get_current_categories( tree_id ) },
+        "dataType": 'text',
+        "type": 'put'
+      });
+    }).bind('delete_node.jstree', function(e, data){
+      var NODE = data.rslt.obj;
+      var cat_id = get_rails_element_id(NODE);
+      jQuery.ajax({
+        "url": base_url + cat_id,
+        "success": function(request){
+          jQuery(NODE).attr('id', 'category_' + request.responseText);
+        },
+        "data": {authenticity_token: window._forgeos_js_vars.token, format: 'json'},
+        "dataType":'text',
+        "type":'delete'
+      });
+    }).bind('copy.jstree', function(e, data) {
+      duplicate_category(data.rslt.obj, type, undefined, base_url);
+    }).bind('select_node.jstree', function(e, data) {
+      var NODE = data.rslt.obj;
+      jQuery(".parent_id_hidden").remove();
+      var cat_id = get_rails_element_id(NODE);
+      var current_table = jQuery('#table').dataTableInstance();
+      var url = current_table.fnSettings().sAjaxSource;
+      var url_base = url.split('?')[0];
+
+      jQuery('#category_sort').show();
+      // update category id
+      var params = get_json_params_from_url(url);
+      params.category_id = cat_id;
+      params = stringify_params_from_json(params);
+
+      // construct url and redraw table
+      update_current_dataTable_source('#table',url_base + '?' + params);
+
+      //object_name = jQuery(NODE).attr('id').split('_')[0];
+      category_id = get_rails_element_id(NODE);
+      if(jQuery(".parent_id_hidden").size() == 0){
+        jQuery(document.body).append('<input type="hidden" id="parent_id_tmp" name="parent_id_tmp" class="parent_id_hidden" value="'+category_id+'" />');
+      } else {
+        jQuery('#parent_id_tmp').val(category_id);
+      }
+      return true;
+    }).bind('deselect_node.jstree', function(e, data) {
+      jQuery('#category_sort').hide();
+      return true;
+    }).jstree({
+      "json_data":{
+        "ajax": {
+          "url": source
+        },
+        "progressive_render": true
+      },
+      "contextmenu": {
+        "items": {
+          "create": {
+            "label": "Créer",
+            "icon": "create",
+            "action": function(obj) {
+              this.create(this._get_node(obj), 0, {}, null, false);
             },
             separator_after : false
           },
-          rename : {
-            label : "Renommer",
-            icon  : "rename",
-            visible : function (NODE, TREE_OBJ) {
-              if(NODE.length != 1) return false;
-              return TREE_OBJ.check("renameable", NODE);
-            },
-            action  : function (NODE, TREE_OBJ) {
-              TREE_OBJ.rename(NODE);
+          "rename": {
+            "label": "Renommer",
+            "icon": "rename",
+            "action": function(obj) {
+              this.rename(obj);
             }
           },
-          remove : {
-            label : "Supprimer",
-            icon  : "remove",
-            visible : function (NODE, TREE_OBJ) {
-              var ok = true;
-              jQuery.each(NODE, function () {
-                if(TREE_OBJ.check("deletable", this) == false) {
-                  ok = false;
-                  return false;
-                }
-              });
-              return ok;
-            },
-            action  : function (NODE, TREE_OBJ) {
-              jQuery.each(NODE, function () {
-                TREE_OBJ.remove(this);
+          "remove": {
+            "label": "Supprimer",
+            "icon": "remove",
+            "action": function(obj) {
+              var tree = this;
+              jQuery.each(obj, function () {
+                tree.remove(this);
               });
             }
           },
-          add_image : {
-            label : "Add image",
-            icon  : "image",
-            visible : function (NODE, TREE_OBJ) {
-              var ok = true;
-              jQuery.each(NODE, function () {
-                if(TREE_OBJ.check("deletable", this) == false) {
-                  ok = false;
-                  return false;
-                }
-              });
-              return ok;
-            },
-            action  : function (NODE, TREE_OBJ) {
-              var cat_id = get_rails_element_id(NODE);
+          "add_image": {
+            "label": "Changer l'image",
+            "icon": "image",
+            "action": function(obj) {
+              var cat_id = get_rails_element_id(obj);
               jQuery('.tree-li-selected-to-add-image').each(function(){
                 jQuery(this).removeClass('tree-li-selected-to-add-image');
               });
-              jQuery(NODE).addClass("tree-li-selected-to-add-image");
+              jQuery(obj).addClass("tree-li-selected-to-add-image");
 
               openimageUploadDialogLeftSidebar(cat_id);
               return false;
             }
           }
         }
-      }
-    },
-    ui: {
-      theme_path: '/assets/forgeos/jstree/themes/',
-      theme_name : 'categories',
-      selected_parent_close: false
-    },
-    callback: {
-      onload: function(TREE_OBJ){
-        tree_id = jQuery(TREE_OBJ.container).attr('id');
-        //display_notifications();
-        jQuery(TREE_OBJ.container).removeClass('tree-default');
-        jQuery(TREE_OBJ.container).find('a').each(function(index,selector){
-          var category_id = get_rails_element_id(jQuery(selector).parent('li'));
-          jQuery(selector).droppable({
-            hoverClass: 'ui-state-hover',
-            drop:function(ev, ui){
-              jQuery.ajax({
-              data: {element_id:get_rails_element_id(jQuery(ui.draggable)), authenticity_token: encodeURIComponent(window._forgeos_js_vars.token)},
-              success:function(request){jQuery(ev.target).find('span').html(request);},
-              type:'post',
-              url:'/admin/categories/' + category_id + '/add_element'
-              });
-            }
-          });
-        });
-      },
-      oncreate: function(NODE,REF_NODE,TYPE,TREE_OBJ,RB){
-        var parent_node = jQuery(NODE).parent().parent('li');
-        var parent_id;
-        // get parent_id if parent node exists
-        if (parent_node[0] != undefined)
-          parent_id = get_rails_element_id(parent_node);
-
-        jQuery.ajax({
-          url: '/admin/categories/create',
-          complete: function(request){
-            var cat_id = request.responseText
-
-            jQuery(NODE).attr('id', 'cageory_' + cat_id);
-            jQuery(NODE).children('a').attr('id', 'link_category_' + cat_id);
-            set_category_droppable(cat_id, type);
-
-            if( jQuery(".parent_id_hidden").size() == 0){
-              jQuery(document.body).append('<input type="hidden" id="parent_id_tmp" name="parent_id_tmp" class="parent_id_hidden" value="'+cat_id+'" />');
-            } else {
-              jQuery('#parent_id_tmp').val(cat_id);
-            }
-
-          },
-          data: get_category_data('New folder', type, parent_id),
-          dataType: 'text',
-          type: 'post'
-        });
-      },
-      onrename: function(NODE,LANG,TREE_OBJ,RB){
-        var cat_id = get_rails_element_id(NODE);
-        jQuery.ajax({
-            url: '/admin/categories/' + cat_id,
-              // update elements count
-              complete: function(request) {
-                jQuery.tree.focused().refresh();
-              },
-              data: {authenticity_token:window._forgeos_js_vars.token, format: 'json', 'category[name]': jQuery(NODE).children('a').text()},
-              dataType:'text',
-              type:'put'
-              });
-      },
-      onmove: function(NODE,LANG,TREE_OBJ,RB){
-        var cat_id = get_rails_element_id(NODE);
-        var parent_id = '';
-        var parent_ul = jQuery(NODE).parents('ul:first');
-        var position = jQuery(parent_ul).children('li').index(jQuery(NODE));
-        var tree_id = jQuery(RB.container).attr('id');
-
-        position = position+1;
-        if (jQuery(NODE).parent().parent('li').length > 0){
-          parent_id = get_rails_element_id(jQuery(NODE).parent().parent('li'));
-        }
-        jQuery.ajax({
-          url: '/admin/categories/' + cat_id,
-            // update elements count
-            complete: function(request) {
-              //jQuery.tree.focused().refresh();
-            },
-            data: {authenticity_token:window._forgeos_js_vars.token, format: 'json', 'categories_hash': get_current_categories( tree_id ) },
-            dataType:'text',
-            type:'put'
-        });
-      },
-      ondelete: function(NODE,TREE_OBJ){
-        var cat_id = get_rails_element_id(NODE);
-        jQuery.ajax({
-            url: '/admin/categories/' + cat_id,
-              success: function(request){
-                jQuery(NODE).attr('id', 'cageory_' + request.responseText);
-              },
-              data: {authenticity_token:window._forgeos_js_vars.token, format: 'json'},
-              dataType:'text',
-              type:'delete'
-              });
-      },
-      oncopy: function(NODE,REF_NODE,TYPE,TREE_OBJ,RB) { duplicate_category(NODE, type); },
-      onselect: function(NODE,TREE_OBJ) {
-        jQuery(".parent_id_hidden").remove();
-        var cat_id = get_rails_element_id(NODE);
-        var current_table = jQuery('#table').dataTableInstance();
-        var url = current_table.fnSettings().sAjaxSource;
-        var url_base = url.split('?')[0];
-
-        jQuery('#category_sort').show();
-        // update category id
-        var params = get_json_params_from_url(url);
-        params.category_id = cat_id;
-        params = stringify_params_from_json(params);
-
-        // construct url and redraw table
-        update_current_dataTable_source('#table',url_base + '?' + params);
-
-        object_name = jQuery(NODE).attr('id').split('_')[0];
-        category_id = get_rails_element_id(NODE);
-        if(jQuery(".parent_id_hidden").size() == 0){
-          jQuery(document.body).append('<input type="hidden" id="parent_id_tmp" name="parent_id_tmp" class="parent_id_hidden" value="'+category_id+'" />');
-        } else {
-          jQuery('#parent_id_tmp').val(category_id);
-        }
-        return true;
       },
-      ondeselect: function(NODE,TREE_OBJ) {
-        jQuery('#category_sort').hide();
-        return true;
+      "themes": {
+        "theme": 'categories'
       },
-      // remove count span
-      beforerename: function(NODE,LANG,TREE_OBJ) {
-        jQuery(NODE).children('a').html(extract_category_name(NODE));
-        jQuery(NODE).children('a').addClass('folder');
-        return true;
+      "ui": {
+        "selected_parent_close": false
       },
-      // add class big-icons to new category
-      beforecreate: function(NODE,REF_NODE,TYPE,TREE_OBJ) {
-        jQuery(NODE).children('a').addClass('folder');
-        jQuery(NODE).children('a').addClass('big-icons');
-        return true
-      }
-    }
-  });
+      "plugins": ['themes', 'json_data', 'contextmenu', 'ui', 'crrm']
+    });
+  }
 }
 
 //check if something is selected in jsTree
 function check_jsTree_selected(element){
-  if(jQuery.tree_reference(element).selected!=undefined){
+  if(typeof(jQuery.jstree._reference(element).selected) != 'undefined'){
     return true;
+  } else {
+    return false;
+  }
+}
+
+/*
+ *call when ther's a problem with jsTree control
+ *param : message
+ **/
+function error_on_jsTree_action(message){
+}
+
+// initialize tree for category associations
+function init_association_category_tree(selector, object_name, category_name, theme){
+  if (jQuery(selector).size() != 0) {
+    jQuery(selector).bind('check_node.jstree', function(e, data){
+      var jnode = jQuery(data.rslt.obj);
+      if (typeof(object_name) == 'undefined') {
+        var oname = jnode.attr('id').split('_')[0];
+      } else {
+        var oname = object_name;
+      }
+      var category_id = get_rails_element_id(jnode);
+      jnode.append('<input type="hidden" id="'+oname+'_'+category_name+'_ids_'+category_id+'" name="'+oname+'['+category_name+'_ids][]" value="'+category_id+'" />');
+      jnode.addClass('jstree-clicked');
+    }).bind('uncheck_node.jstree', function(e, data){
+      var jnode = jQuery(data.rslt.obj);
+      jnode.children('input').remove();
+      jnode.removeClass('jstree-clicked');
+    }).jstree({
+      "themes": {
+        "theme": theme
+      },
+      "ui": {
+        "selected_parent_close": false
+      },
+      "plugins": ['html_data', 'ui', 'themes', 'checkbox']
+    });
   }
-  return false;
 }
 
 // unselect current node and refresh dataTables
@@ -278,7 +266,7 @@ function select_all_elements_by_url(url) {
 
 // unselect current node, remove category and refresh dataTable
 function select_all_elements_without_category(tree_id) {
-  var t = jQuery.tree.focused();
+  var t = jQuery.jstree._focused();
 
   // unselect current selected node
   if (t) {
@@ -360,10 +348,10 @@ function addPageClasses(block_id){
 
 //Return current tree to json
 function get_current_categories( tree_id ){
-  return JSON.stringify(jQuery.tree.reference("#"+tree_id ).get());
+  return JSON.stringify(jQuery.jstree._reference("#"+tree_id ).get());
 }
 
-function createNewLevel(parent,item, TREE_OBJ, level) {
+function createNewLevel(parent_node,item, TREE_OBJ, level) {
   jQuery(item).each(function(){
     var cat_id = get_rails_element_id(jQuery(this));
     var parent_ul = jQuery(TREE_OBJ).children();
@@ -376,53 +364,10 @@ function createNewLevel(parent,item, TREE_OBJ, level) {
     }
     else{
       if(jQuery(this).children().length > 1){
-        parent["category_"+cat_id] = {};
-        createNewLevel(parent["category_"+cat_id],jQuery(this).children().children(), TREE_OBJ);
-      }
-      else{
-        parent["category_"+cat_id] = cat_id;
-      }
-    }
-  });
-}
-
-/*
- *call when ther's a problem with jsTree control
- *param : message
- **/
-function error_on_jsTree_action(message){
-}
-
-// initialize tree for category associations
-function init_association_category_tree(selector, object_name, category_name, theme){
-  jQuery(selector).tree({
-    ui: {
-      theme_path: '/assets/forgeos/jstree/themes/',
-      theme_name : theme,
-      selected_parent_close: false
-    },
-    rules: { multiple:'on' },
-    callback: {
-      onload: function(TREE_OBJ){
-        tree_id = jQuery(TREE_OBJ.container).attr('id');
-        jQuery(TREE_OBJ.container).removeClass('tree-default');
-      },
-      onrgtclk: function(NODE,TREE_OBJ,EV){
-        EV.preventDefault(); EV.stopPropagation(); return false;
-      },
-      onselect: function(NODE,TREE_OBJ){
-        if (typeof(object_name) == 'undefined') {
-          var oname = jQuery(NODE).attr('id').split('_')[0];
-        } else {
-          var oname = object_name;
-        }
-        var category_id = get_rails_element_id(NODE);
-        jQuery(NODE).append('<input type="hidden" id="'+oname+'_'+category_name+'_ids_'+category_id+'" name="'+oname+'['+category_name+'_ids][]" value="'+category_id+'" />');
-        jQuery(NODE).addClass('clicked');
-      },
-      ondeselect: function(NODE,TREE_OBJ){
-        jQuery(NODE).children('input').remove();
-        jQuery(NODE).removeClass('clicked');
+        parent_node["category_"+cat_id] = {};
+        createNewLevel(parent_node["category_"+cat_id],jQuery(this).children().children(), TREE_OBJ);
+      } else{
+        parent_node["category_"+cat_id] = cat_id;
       }
     }
   });

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/left-sidebar.js

@@ -86,14 +86,11 @@ jQuery(document).ready(function(){
    **/
   jQuery('.create-folder, .create-smart').live('click',function(){
     var tree_id = jQuery('.category-tree').attr('id');
-    var tree = jQuery.tree.reference(tree_id);
-    if (tree){
-      if(tree.selected){
-        tree.create();
-      }
-      else{
-        tree.create({},-1);
-      }
+    var t = jQuery.jstree._reference(tree_id);
+    if(t.get_selected()){
+      t.create(t.get_selected(),0);
+    } else {
+      t.create(null,0);
     }
   });
 
@@ -103,11 +100,10 @@ jQuery(document).ready(function(){
    *param : tree_id => id of current-tree  line 104
    **/
   jQuery('.modify-folder').live('click',function(){
-    var t = jQuery.tree.focused();
-    if(t.selected){
-       t.rename()
-    }
-    else{
+    var t = jQuery.jstree._focused();
+    if(t.get_selected()){
+       t.rename(t.get_selected());
+    } else {
        error_on_jsTree_action("please select a category first");
     }
   });
@@ -118,11 +114,10 @@ jQuery(document).ready(function(){
    *param : tree_id => id of current-tree line 104
    **/
   jQuery('.delete-folder').live('click',function(){
-    var t = jQuery.tree.focused();
-    if(t.selected){
-       t.remove();
-    }
-    else{
+    var t = jQuery.jstree._focused();
+    if(t.get_selected()){
+       t.remove(t.get_selected());
+    } else {
        error_on_jsTree_action("please select a category first");
     }
   });
@@ -133,13 +128,11 @@ jQuery(document).ready(function(){
    *param : tree_id => id of current-tree line 104
    **/
    jQuery('.duplicate-folder').live('click',function(){
-    var t = jQuery.tree.focused();
-    if(t.selected){
+    var t = jQuery.jstree._focused();
+    if(t.get_selected()){
       t.copy();
       t.paste(-1);
-
-    }
-    else{
+    } else {
        error_on_jsTree_action("please select a category first");
     }
   });

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/settings.js

@@ -1,15 +1,15 @@
 jQuery(document).ready(function(){
-  jQuery("#blocks-header.backgrounds.settings").tabs();
- 
+  jQuery("#blocks-header").tabs();
+
   jQuery('#setting_mailer_delivery_method').change(function(){
     var value = jQuery('#setting_mailer_delivery_method').val();
     jQuery('.delivery_method_settings').hide();
     jQuery('#'+value).show();
   })
 
-  if (jQuery('#setting_mailer_delivery_method').val() != null){
-    var value = jQuery('#setting_mailer_delivery_method').val();
+  var current_mailer_setting = jQuery('#setting_mailer_delivery_method').val();
+  if (current_mailer_setting != null){
     jQuery('.delivery_method_settings').hide();
-    jQuery('#'+value).show();
+    jQuery('#'+current_mailer_setting).show();
   }
 });