diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js index 9e9ace043..6fd80c626 100644 --- a/admin/javascript/LeftAndMain.Content.js +++ b/admin/javascript/LeftAndMain.Content.js @@ -305,7 +305,7 @@ $('.cms-content .cms-panel-link, .cms-content a.crumb').entwine({ onclick: function(e) { var href = this.attr('href'), url = href ? href : this.data('href'), - data = (this.data('target-panel')) ? {selector: this.data('target-panel')} : null; + data = (this.data('targetPanel')) ? {selector: this.data('targetPanel')} : null; $('.cms-container').entwine('ss').loadPanel(url, null, data); e.preventDefault(); diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js index 248c9d059..c72395b84 100644 --- a/admin/javascript/LeftAndMain.Tree.js +++ b/admin/javascript/LeftAndMain.Tree.js @@ -106,7 +106,7 @@ // Add ajax settings after init period to avoid unnecessary initial ajax load // of existing tree in DOM - see load_node_html() data.inst._set_settings({'html_data': {'ajax': { - 'url': self.data('url-tree'), + 'url': self.data('urlTree'), 'data': function(node) { var params = self.data('searchparams') || []; // Avoid duplication of parameters @@ -145,7 +145,7 @@ }); $.ajax({ - 'url': self.data('url-savetreenode'), + 'url': self.data('urlSavetreenode'), 'data': { ID: $(movedNode).data('id'), ParentID: $(newParentNode).data('id') || 0, diff --git a/javascript/TreeDropdownField.js b/javascript/TreeDropdownField.js index 132ef112b..91cc00f31 100644 --- a/javascript/TreeDropdownField.js +++ b/javascript/TreeDropdownField.js @@ -146,7 +146,7 @@ var self = this, panel = this.getPanel(), treeHolder = $(panel).find('.tree-holder'); var params = (params) ? $.extend({}, this.getRequestParams(), params) : this.getRequestParams(); panel.addClass('loading'); - treeHolder.load(this.data('url-tree'), params, function(html, status, xhr) { + treeHolder.load(this.data('urlTree'), params, function(html, status, xhr) { var firstLoad = true; if(status == 'success') { $(this) @@ -194,7 +194,7 @@ // TODO Hack to avoid ajax load on init, see http://code.google.com/p/jstree/issues/detail?id=911 'data': this.getPanel().find('.tree-holder').html(), 'ajax': { - 'url': this.data('url-tree'), + 'url': this.data('urlTree'), 'data': function(node) { var id = $(node).data("id") ? $(node).data("id") : 0, params = self.getRequestParams(); params = $.extend({}, params, {ID: id, ajax: 1}); @@ -315,7 +315,7 @@ var self = this, panel = this.getPanel(), treeHolder = $(panel).find('.tree-holder'); var params = (params) ? $.extend({}, this.getRequestParams(), params) : this.getRequestParams(); panel.addClass('loading'); - treeHolder.load(this.data('url-tree'), params, function(html, status, xhr) { + treeHolder.load(this.data('urlTree'), params, function(html, status, xhr) { var firstLoad = true; if(status == 'success') { $(this)