Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 02df15e

Browse files
cpatrickcpatrick
committed
ENH: refs #0473. Javascript refactoring.
This is nowhere near complete.
1 parent 689b377 commit 02df15e

File tree

15 files changed

+662
-671
lines changed

15 files changed

+662
-671
lines changed

‎core/public/js/admin/admin.index.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var midas = midas || {};
12
$(document).ready(function() {
23

34
tabs=$( "#tabsGeneric" ).tabs({
@@ -34,7 +35,7 @@
3435
$('input.deleteAssetstoreYes').unbind('click').click(function()
3536
{
3637
$( "div.MainDialog" ).dialog('close');
37-
ajaxSelectRequest = $.ajax({
38+
midas.ajaxSelectRequest = $.ajax({
3839
type: "POST",
3940
url: json.global.webroot+'/assetstore/delete',
4041
data: {assetstoreId: element},
@@ -71,7 +72,7 @@
7172

7273
$('input#assetstoreSubmit').unbind('click').click(function()
7374
{
74-
ajaxSelectRequest = $.ajax({
75+
midas.ajaxSelectRequest = $.ajax({
7576
type: "POST",
7677
url: json.global.webroot+'/assetstore/edit',
7778
data: {assetstoreId: element, assetstoreName: $('input#assetstoreName').val(), assetstorePath: $('input#assetstorePath').val()},

‎core/public/js/admin/admin.showlog.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var midas = midas || {};
12
// Log priority enum
23
var priorityMap = { 2 : 'critical', 4: 'warning', 6: 'info' };
34

@@ -51,7 +52,7 @@ $('button#deleteSelected').click(function() {
5152
if(selected != '')
5253
{
5354
$('table#listLogs').trigger('update');
54-
ajaxSelectRequest = $.ajax({
55+
midas.ajaxSelectRequest = $.ajax({
5556
type: 'POST',
5657
url: json.global.webroot+'/admin/deletelog',
5758
dataType: 'json',

‎core/public/js/browse/browse.index.js‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
$(document).ready(function() {
2-
3-
$("#browseTable").treeTable();
4-
5-
$("img.tableLoading").hide();
6-
$("table#browseTable").show();
7-
8-
$('div.feedThumbnail img').fadeTo("slow",0.4);
9-
$('div.feedThumbnail img').mouseover(function(){
10-
$(this).fadeTo("fast",1);
11-
});
1+
var midas = midas || {};
2+
$(document).ready(
3+
function() {
4+
$("#browseTable").treeTable();
5+
$("img.tableLoading").hide();
6+
$("table#browseTable").show();
7+
8+
$('div.feedThumbnail img').fadeTo("slow",0.4);
9+
$('div.feedThumbnail img').mouseover(
10+
function() {
11+
$(this).fadeTo("fast",1);
12+
});
1213

13-
$('div.feedThumbnail img').mouseout(function(){
14-
$(this).fadeTo("fast",0.4);
15-
});
14+
$('div.feedThumbnail img').mouseout(
15+
function() {
16+
$(this).fadeTo("fast",0.4);
17+
});
1618

17-
$('a.createCommunity').click(function()
18-
{
19-
if(json.global.logged)
20-
{
21-
loadDialog("createCommunity","/community/create");
22-
showDialog(json.community.createCommunity,false);
23-
}
24-
else
25-
{
26-
createNotive(json.community.contentCreateLogin,4000)
27-
$("div.TopDynamicBar").show('blind');
28-
loadAjaxDynamicBar('login','/user/login');
29-
}
30-
});
19+
$('a.createCommunity').click(
20+
function() {
21+
if(json.global.logged) {
22+
loadDialog("createCommunity","/community/create");
23+
showDialog(json.community.createCommunity,false);
24+
}
25+
else {
26+
createNotive(json.community.contentCreateLogin,4000);
27+
$("div.TopDynamicBar").show('blind');
28+
loadAjaxDynamicBar('login','/user/login');
29+
}
30+
});
3131

3232

33-
$('.itemBlock').click(function(){
34-
$(location).attr('href',($('> .itemTitle',this).attr('href')));
35-
})
33+
$('.itemBlock').click(
34+
function() {
35+
$(location).attr('href',($('> .itemTitle',this).attr('href')));
36+
});
3637

37-
});
38+
});
3839

39-
//dependance: common/browser.js
40-
var ajaxSelectRequest='';
41-
function callbackSelect(node)
42-
{
43-
$('div.defaultSide').hide();
44-
$('div.viewAction').show();
45-
$('div.viewInfo').show();
46-
$('div.ajaxInfoElement').show();
47-
genericCallbackSelect(node);
48-
}
40+
//dependance: common/browser.js
41+
// Treetable depends on some global functions. This is terrible. Our javascript
42+
// is absolutely shameful. That's why I didn't namespace these functions.
43+
midas.ajaxSelectRequest='';
44+
var callbackSelect = function(node) {
45+
$('div.defaultSide').hide();
46+
$('div.viewAction').show();
47+
$('div.viewInfo').show();
48+
$('div.ajaxInfoElement').show();
49+
midas.genericCallbackSelect(node);
50+
};
4951

50-
function callbackDblClick(node)
51-
{
52-
genericCallbackDblClick(node);
53-
}
52+
var callbackDblClick = function(node) {
53+
midas.genericCallbackDblClick(node);
54+
};
5455

55-
function callbackCheckboxes(node)
56-
{
57-
genericCallbackCheckboxes(node);
58-
}
56+
var callbackCheckboxes = function(node) {
57+
midas.genericCallbackCheckboxes(node);
58+
};

‎core/public/js/browse/browse.movecopy.js‎

Lines changed: 75 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,89 @@
1-
$("#moveTable").treeTable({
2-
callbackSelect: moveCopyCallbackSelect,
3-
callbackCheckboxes: moveCopyCallbackCheckboxes,
4-
callbackDblClick: moveCopyCallbackDblClick,
5-
callbackCustomElements: moveCopyCallbackCustomElements
6-
});
7-
$("img.tableLoading").hide();
8-
$("table#moveTable").show();
1+
var midas = midas || {};
2+
midas.browse = midas.browse || {};
3+
$(document).ready(
4+
function() {
5+
$("#moveTable").treeTable(
6+
{
7+
callbackSelect: midas.browse.moveCopyCallbackSelect,
8+
callbackCheckboxes: midas.browse.moveCopyCallbackCheckboxes,
9+
callbackDblClick: midas.browse.moveCopyCallbackDblClick,
10+
callbackCustomElements: midas.browse.moveCopyCallbackCustomElements
11+
});
12+
$("img.tableLoading").hide();
13+
$("table#moveTable").show();
914

10-
$('applet').hide();
15+
$('applet').hide();
1116

12-
if($('#selectElement')!=undefined)
13-
{
14-
$('#selectElement').click(function(){
15-
$('#destinationUpload').html($('#selectedDestination').html());
16-
$('#destinationId').val($('#selectedDestinationHidden').val());
17-
$('.destinationUpload').html($('#selectedDestination').html());
18-
$('.destinationId').val($('#selectedDestinationHidden').val());
19-
$( "div.MainDialog" ).dialog('close');
20-
$('applet').show();
21-
return false;
22-
});
23-
}
24-
25-
//dependance: common/browser.js
26-
var ajaxSelectRequest='';
27-
function moveCopyCallbackSelect(node)
28-
{
29-
var selectedElement = node.find('span:eq(1)').html();
17+
if($('#selectElement') != undefined) {
18+
$('#selectElement').click(
19+
function() {
20+
var destHtml = $('#selectedDestination').html();
21+
var destValue = $('#selectedDestinationHidden').val();
22+
$('#destinationUpload').html(destHtml);
23+
$('#destinationId').val(destValue);
24+
$('.destinationUpload').html(destHtml);
25+
$('.destinationId').val(destValue);
26+
$( "div.MainDialog" ).dialog('close');
27+
$('applet').show();
28+
return false;
29+
});
30+
}
31+
$('img.infoLoading').show();
32+
$('div.ajaxInfoElement').html('');
33+
});
3034

31-
var parent = true;
32-
var current = node;
35+
//dependance: common/browser.js
36+
midas.ajaxSelectRequest='';
37+
midas.browse.moveCopyCallbackSelect = function (node) {
38+
var selectedElement = node.find('span:eq(1)').html();
39+
var parent = true;
40+
var current = node;
3341

34-
while(parent != null)
35-
{
42+
while(parent != null) {
3643
parent = null;
3744
var classNames = current[0].className.split(' ');
38-
for(key in classNames)
39-
{
40-
if(classNames[key].match("child-of-"))
41-
{
42-
parent = $("#" + classNames[key].substring(9));
45+
for(key in classNames) {
46+
if(classNames[key].match("child-of-")) {
47+
parent = $("#" + classNames[key].substring(9));
4348
}
44-
}
45-
if(parent != null)
46-
{
47-
selectedElement = parent.find('span:eq(1)').html()+'/'+selectedElement;
48-
current = parent;
49-
}
5049
}
51-
52-
$('#selectedDestinationHidden').val(node.attr('element'));
53-
$('#selectedDestination').html(sliceFileName(selectedElement, 40));
54-
$('#selectElement').removeAttr('disabled');
55-
$('#shareElement').removeAttr('disabled');
56-
$('#duplicateElement').removeAttr('disabled');
57-
$('#moveElement').removeAttr('disabled');
58-
}
59-
60-
61-
$('img.infoLoading').show();
62-
$('div.ajaxInfoElement').html('');
63-
64-
65-
function moveCopyCallbackDblClick(node)
66-
{
67-
// genericCallbackDblClick(node);
50+
if(parent != null) {
51+
selectedElement = parent.find('span:eq(1)').html()+'/'+selectedElement;
52+
current = parent;
53+
}
6854
}
6955

70-
function moveCopyCallbackCheckboxes(node)
71-
{
72-
// genericCallbackCheckboxes(node);
73-
}
56+
$('#selectedDestinationHidden').val(node.attr('element'));
57+
$('#selectedDestination').html(sliceFileName(selectedElement, 40));
58+
$('#selectElement').removeAttr('disabled');
59+
$('#shareElement').removeAttr('disabled');
60+
$('#duplicateElement').removeAttr('disabled');
61+
$('#moveElement').removeAttr('disabled');
62+
};
7463

75-
function moveCopyCallbackCustomElements(node,elements,first)
76-
{
77-
var i = 1;
78-
var id=node.attr('id');
79-
elements['folders'] = jQuery.makeArray(elements['folders']);
8064

81-
var padding=parseInt(node.find('td:first').css('padding-left').slice(0,-2));
82-
var html='';
65+
midas.browse.moveCopyCallbackDblClick = function (node) {
66+
// midas.genericCallbackDblClick(node);
67+
};
8368

84-
$.each(elements['folders'], function(index, value) {
85-
if(value['policy']!='0')
86-
{
87-
html+= "<tr id='"+id+"-"+i+"' class='parent child-of-"+id+"' ajax='"+value['folder_id']+"'type='folder' policy='"+value['policy']+"' element='"+value['folder_id']+"'>";
88-
html+= " <td><span class='folder'>"+trimName(value['name'],padding)+"</span></td>";
89-
html+= "</tr>";
90-
i++;
91-
}
92-
});
93-
return html;
94-
}
69+
midas.browse.moveCopyCallbackCheckboxes = function (node) {
70+
// midas.genericCallbackCheckboxes(node);
71+
};
9572

73+
midas.browse.moveCopyCallbackCustomElements = function (node,elements,first) {
74+
var i = 1;
75+
var id=node.attr('id');
76+
elements['folders'] = jQuery.makeArray(elements['folders']);
77+
var padding=parseInt(node.find('td:first').css('padding-left').slice(0,-2));
78+
var html='';
79+
$.each(elements['folders'],
80+
function(index, value) {
81+
if(value['policy']!='0') {
82+
html+= "<tr id='"+id+"-"+i+"' class='parent child-of-"+id+"' ajax='"+value['folder_id']+"'type='folder' policy='"+value['policy']+"' element='"+value['folder_id']+"'>";
83+
html+= " <td><span class='folder'>"+trimName(value['name'],padding)+"</span></td>";
84+
html+= "</tr>";
85+
i++;
86+
}
87+
});
88+
return html;
89+
};

‎core/public/js/browse/browse.selectfolder.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ function selectFolderCallbackReloadNode(mainNode)
127127

128128
function selectFolderCallbackDblClick(node)
129129
{
130-
// genericCallbackDblClick(node);
130+
// midas.genericCallbackDblClick(node);
131131
}
132132

133133
function selectFolderCallbackCheckboxes(node)
134134
{
135-
// genericCallbackCheckboxes(node);
135+
// midas.genericCallbackCheckboxes(node);
136136
}
137137

138138
function selectFolderCallbackCustomElements(node,elements,first)

0 commit comments

Comments
 (0)