Skip to content

Commit 89dde9f

Browse files
ershwetabansalershwetabansal
committed
Update integration specs for disk browser
1 parent cea3c36 commit 89dde9f

File tree

10 files changed

+754
-197
lines changed

10 files changed

+754
-197
lines changed

‎dist/js/disk-browser.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -843,11 +843,11 @@ function setupElementsAndEvents() {
843843
function setupFileBrowserModal(callback) {
844844
if ($('#disk-browser').length == 0) {
845845
$('body').append('<div id="disk-browser"></div>');
846+
$('#disk-browser').load(element.getDiskBrowserPath() + '/partials/disk-browser.html', function(){
847+
if (callback) callback();
848+
});
846849
}
847850

848-
$('#disk-browser').load(element.getDiskBrowserPath() + '/partials/disk-browser.html', function(){
849-
if (callback) callback();
850-
});
851851
}
852852

853853
function createDirectorySetup() {
@@ -1102,7 +1102,7 @@ function getCurrentFilePath() {
11021102

11031103
function makeAjaxRequest(url, successCallback, failureCallback, cache, data, isUpload) {
11041104

1105-
var method = 'POST';
1105+
var method = 'POST';
11061106

11071107
if (typeof(cache) == 'undefined') {
11081108
cache = true;
@@ -1111,14 +1111,14 @@ function makeAjaxRequest(url, successCallback, failureCallback, cache, data, isU
11111111

11121112
showLoadingBar(true);
11131113
$.ajax(getAjaxParameters()).success(function (data) {
1114-
if (successCallback) successCallback(data);
1114+
if (successCallback) successCallback(data);
11151115
showLoadingBar(false);
11161116
element.getErrorMessagePlaceHolder().text('');
11171117
}).fail(function (response) {
11181118
if (failureCallback) failureCallback(response);
11191119
showLoadingBar(false);
11201120
updateError(response);
1121-
});
1121+
});
11221122

11231123
function getAjaxParameters() {
11241124
var parameters = {

‎src/js/Fbrowser/controllers/manager.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ function manager(setupObject)
5757

5858
}
5959

60-
function doInitialSetup() {
60+
function doInitialSetup(isTest) {
6161
requestHandler.setupHandlers(new DiskHandler(),
6262
new DirHandler(), new FileHandler(), eventHandler);
6363
requestHandler.setupParameters(disksParam, directoriesParam, filesParam, httpParam, authParam);
64-
requestHandler.setupElementsAndEvents();
64+
requestHandler.setupElementsAndEvents(isTest);
6565
}
6666

6767
function load(modalBoxParams) {

‎src/js/Fbrowser/handlers/eventHandler.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ function attachSearchFilesEvent() {
104104
reqHandler.makeAjaxRequest(url, success, fail, false, params);
105105

106106
function fail() {
107-
alert('failed to search disk');
107+
alert('failed to search disk');
108108
}
109109

110110
function success(data) {
111-
reqHandler.getFileHandler().showFiles(data.files);
111+
reqHandler.getFileHandler().showFiles(data.files);
112112
element.select(element.getFileSearchOptions(), liElement);
113113
}
114114
});
@@ -239,21 +239,20 @@ function attachCreateDirectoryEvent(url) {
239239
}
240240

241241
function focusOutEvent() {
242-
var newValue = inputElement.val();
243-
if (oldValue != newValue && newValue != '') {
244-
var params = reqHandler.getDirHandler().getNewDirectoryData(inputElement);
242+
var newValue = inputElement.val();
243+
if (oldValue != newValue && newValue != '') {
244+
var params = reqHandler.getDirHandler().getNewDirectoryData(inputElement);
245245
reqHandler.makeAjaxRequest(url, success, fail, false, params);
246246
} else {
247247
element.focusAndSelect(inputElement);
248248
}
249249
}
250250

251251
function success(response) {
252-
if (response.success == true) {
252+
if (response.success == true) {
253253
var dirElement = reqHandler.getDirHandler().saveDirectory(inputElement, response.directory.name, response.directory.path);
254254
reqHandler.attachDirectoryEvents(dirElement);
255255
} else {
256-
alert('Directory already exists');
257256
reqHandler.getDirHandler().removeDirectory(inputElement);
258257
}
259258

‎src/js/Fbrowser/handlers/handler.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@ function setupParameters(disk, dir, files, http, auth) {
2222
authParams = auth || {};
2323
}
2424

25-
function setupElementsAndEvents() {
25+
function setupElementsAndEvents(isTest) {
2626
setupFileBrowserModal(function() {
2727
//Show/Hide manager controls and attach corresponding events
2828
createDirectorySetup();
2929
uploadFileSetup();
3030
setupEvents();
31-
});
31+
}, isTest);
3232
}
3333

34-
function setupFileBrowserModal(callback) {
34+
function setupFileBrowserModal(callback, isTest) {
3535
if ($('#disk-browser').length == 0) {
3636
$('body').append('<div id="disk-browser"></div>');
37+
$('#disk-browser').load(element.getDiskBrowserPath() + '/partials/disk-browser.html', function(){
38+
if (callback) callback();
39+
});
40+
} else if (isTest) {
41+
callback();
3742
}
3843

39-
$('#disk-browser').load(element.getDiskBrowserPath() + '/partials/disk-browser.html', function(){
40-
if (callback) callback();
41-
});
4244
}
4345

4446
function createDirectorySetup() {
@@ -293,7 +295,7 @@ function getCurrentFilePath() {
293295

294296
function makeAjaxRequest(url, successCallback, failureCallback, cache, data, isUpload) {
295297

296-
var method = 'POST';
298+
var method = 'POST';
297299

298300
if (typeof(cache) == 'undefined') {
299301
cache = true;
@@ -302,14 +304,14 @@ function makeAjaxRequest(url, successCallback, failureCallback, cache, data, isU
302304

303305
showLoadingBar(true);
304306
$.ajax(getAjaxParameters()).success(function (data) {
305-
if (successCallback) successCallback(data);
307+
if (successCallback) successCallback(data);
306308
showLoadingBar(false);
307309
element.getErrorMessagePlaceHolder().text('');
308310
}).fail(function (response) {
309311
if (failureCallback) failureCallback(response);
310312
showLoadingBar(false);
311313
updateError(response);
312-
});
314+
});
313315

314316
function getAjaxParameters() {
315317
var parameters = {
@@ -441,4 +443,4 @@ module.exports = {
441443
getFileResponseParams: getFileResponseParams,
442444
updateButtonDetails : updateButtonDetails
443445

444-
}
446+
};

‎src/js/Fbrowser/helpers/element.js‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,66 @@ var fbElement,
5454
;
5555

5656

57+
function flush() {
58+
fbElement = undefined;
59+
primaryBtn = undefined;
60+
loadingBar = undefined;
61+
errorMessage = undefined;
62+
fileBrowserBody = undefined;
63+
64+
diskDropdown = undefined;
65+
66+
directoryWindow = undefined;
67+
directoriesList = undefined;
68+
createNewDirectory = undefined;
69+
70+
fileWindow = undefined;
71+
fileList = undefined;
72+
fileGrid = undefined;
73+
74+
fileContextMenu = undefined;
75+
fileRename = undefined;
76+
fileRemove = undefined;
77+
fileDownload = undefined;
78+
fileView = undefined;
79+
fileManageMenu = undefined;
80+
81+
directoryContextMenu = undefined;
82+
deleteDirectory = undefined;
83+
84+
fileRenameBox = undefined;
85+
fileRenameClose = undefined;
86+
fileRenameOkay = undefined;
87+
fileRenameInput = undefined;
88+
89+
fileRemoveBox = undefined;
90+
fileRemoveClose = undefined;
91+
fileRemoveOkay = undefined;
92+
93+
uploadFileBtn = undefined;
94+
uploadFileInput = undefined;
95+
cancelFileUploadBtn = undefined;
96+
uploadFileToServerBtn = undefined;
97+
fileBrowserUploadForm = undefined;
98+
uploadFileParamContainer = undefined;
99+
uploadFileLoadingBar = undefined;
100+
101+
fileRefreshBtn = undefined;
102+
fileAlignListBtn = undefined;
103+
fileAlignGridBtn = undefined;
104+
sortFilesDropdown = undefined;
105+
showFileDetailsDiv = undefined;
106+
107+
searchBtn = undefined;
108+
searchCancelBtn = undefined;
109+
searchInput = undefined;
110+
fileSearchOptions = undefined;
111+
}
57112
/************************************************
58113
* Browser window
59114
************************************************/
60115

61-
function getFileBrowser(callback) {
116+
function getFileBrowser() {
62117

63118
if (!fbElement || fbElement.length == 0) {
64119
fbElement= $('#FileBrowser');
@@ -814,5 +869,6 @@ module.exports = {
814869
closeModal: closeModal,
815870
activate: activate,
816871
deactivate: deactivate,
817-
getDiskBrowserPath: getDiskBrowserPath
872+
getDiskBrowserPath: getDiskBrowserPath,
873+
flush: flush
818874
};

‎src/js/Fbrowser/model/file.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ function file() {
5858
gridElements += '</li>';
5959
element.getFilesGrid().append($(gridElements));
6060
}
61+
6162
}
6263

6364
}

0 commit comments

Comments
 (0)