Skip to content

Commit 8e650a5

Browse files
author
minjk-bl
committed
Edit useFile operation on Wordcloud app
1 parent f3a8560 commit 8e650a5

6 files changed

Lines changed: 45 additions & 26 deletions

File tree

‎css/root.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ body {
9797
background-repeat: no-repeat;
9898
border: none;
9999
}
100+
.vp-file-browser-button:hover {
101+
content: url(../img/folder_open_hover.svg);
102+
}
103+
.vp-file-browser-button.disabled {
104+
content: url(../img/folder_open_disabled.svg);
105+
}
100106
.vp-select {
101107
height: 30px;
102108
font-style: normal;

‎html/m_visualize/wordCloud.html‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313
<div class="vp-tab-page-box vp-grid-border-box vp-scrollbar">
1414
<div class="vp-tab-page vp-grid-box" data-type="data">
1515
<label for="data" class="vp-bold">Data</label>
16-
<div class="vp-grid-col-p50">
17-
<div>
18-
<input type="text" id="data" class="vp-input vp-state"/>
19-
<div id="vp_wcOpenFile" class="vp-file-browser-button"></div>
20-
</div>
16+
<div>
17+
<input type="text" id="data" class="vp-input vp-state"/>
2118
<label><input type="checkbox" id="useFile" class="vp-state"><span>Use file</span></label>
19+
<div id="vp_wcOpenFile" class="vp-file-browser-button" style="display:none;"></div>
2220
</div>
23-
2421
<div class="vp-wc-file-option vp-grid-box">
2522
<label for="encoding" class="vp-bold">File encoding</label>
2623
<input type="text" id="encoding" class="vp-input vp-state" />

‎img/folder_open.svg‎

Lines changed: 2 additions & 2 deletions
Loading

‎img/folder_open_disabled.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎img/folder_open_hover.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎js/m_visualize/WordCloud.js‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,37 @@ define([
5353
let that = this;
5454
// open file event for data
5555
$(this.wrapSelector('#vp_wcOpenFile')).on('click', function() {
56-
let fileNavi = new FileNavigation({
57-
type: 'open',
58-
extensions: [ 'txt' ],
59-
finish: function(filesPath, status, error) {
60-
let {file, path} = filesPath[0];
61-
that.state.data = path;
62-
63-
that.state.useFile = true;
64-
$(that.wrapSelector('.vp-wc-file-option')).show();
65-
$(that.wrapSelector('#useFile')).prop('checked', true);
66-
$(that.wrapSelector('#useFile')).trigger('change');
67-
68-
// set text
69-
$(that.wrapSelector('#data')).val(path);
70-
$(that.wrapSelector('#data')).trigger('change');
71-
}
72-
});
73-
fileNavi.open();
56+
if (that.state.useFile === true) {
57+
let fileNavi = new FileNavigation({
58+
type: 'open',
59+
extensions: [ 'txt' ],
60+
finish: function(filesPath, status, error) {
61+
let {file, path} = filesPath[0];
62+
that.state.data = path;
63+
64+
that.state.useFile = true;
65+
$(that.wrapSelector('.vp-wc-file-option')).show();
66+
$(that.wrapSelector('#useFile')).prop('checked', true);
67+
$(that.wrapSelector('#useFile')).trigger('change');
68+
69+
// set text
70+
$(that.wrapSelector('#data')).val(path);
71+
$(that.wrapSelector('#data')).trigger('change');
72+
}
73+
});
74+
fileNavi.open();
75+
}
7476
});
7577

7678
// use file
7779
$(this.wrapSelector('#useFile')).on('change', function() {
7880
let checked = $(this).prop('checked');
7981
if (checked === true) {
8082
$(that.wrapSelector('.vp-wc-file-option')).show();
83+
$(that.wrapSelector('#vp_wcOpenFile')).show();
8184
} else {
8285
$(that.wrapSelector('.vp-wc-file-option')).hide();
86+
$(that.wrapSelector('#vp_wcOpenFile')).hide();
8387
}
8488
});
8589

@@ -116,8 +120,10 @@ define([
116120

117121
if (this.state.useFile == true) {
118122
$(page).find('.vp-wc-file-option').show();
123+
$(page).find('#vp_wcOpenFile').show();
119124
} else {
120125
$(page).find('.vp-wc-file-option').hide();
126+
$(page).find('#vp_wcOpenFile').hide();
121127
}
122128

123129
let that = this;

0 commit comments

Comments
 (0)