Skip to content

Commit 9e75c5c

Browse files
jackycutejackycute
committed
Fix export snippet should check data before sending request and fix some code styles
1 parent aa34faf commit 9e75c5c

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎public/js/index.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ ui.toolbar.export.snippet.click(function() {
12021202
}
12031203
$('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetExportModalProjects");
12041204
});
1205-
$("#snippetExportModalProjects").prop('disabled',false);
1205+
$("#snippetExportModalProjects").prop('disabled', false);
12061206
}
12071207
$("#snippetExportModalLoading").hide();
12081208
})
@@ -1212,7 +1212,6 @@ ui.toolbar.export.snippet.click(function() {
12121212
.complete(function () {
12131213
ui.spinner.hide();
12141214
});
1215-
return false;
12161215
});
12171216
//import from dropbox
12181217
ui.toolbar.import.dropbox.click(function () {
@@ -1291,7 +1290,7 @@ ui.toolbar.import.snippet.click(function () {
12911290
}
12921291
$('<option>').val(project.id).text(project.path_with_namespace).appendTo("#snippetImportModalProjects");
12931292
});
1294-
$("#snippetImportModalProjects").prop('disabled',false);
1293+
$("#snippetImportModalProjects").prop('disabled', false);
12951294
}
12961295
$("#snippetImportModalLoading").hide();
12971296
})
@@ -1301,7 +1300,6 @@ ui.toolbar.import.snippet.click(function () {
13011300
.complete(function () {
13021301
ui.spinner.hide();
13031302
});
1304-
return false;
13051303
});
13061304
//import from clipboard
13071305
ui.toolbar.import.clipboard.click(function () {
@@ -1340,7 +1338,7 @@ ui.modal.snippetImportProjects.change(function() {
13401338
$('<option>').val(snippet.id).text(snippet.title).appendTo($("#snippetImportModalSnippets"));
13411339
});
13421340
$("#snippetImportModalLoading").hide();
1343-
$("#snippetImportModalSnippets").prop('disabled',false);
1341+
$("#snippetImportModalSnippets").prop('disabled', false);
13441342
})
13451343
.error(function(err) {
13461344

@@ -1508,7 +1506,7 @@ $("#snippetImportModalClear").click(function () {
15081506
$("#snippetImportModalContent").val('');
15091507
$("#snippetImportModalProjects").val('init');
15101508
$("#snippetImportModalSnippets").val('init');
1511-
$("#snippetImportModalSnippets").prop('disabled',true);
1509+
$("#snippetImportModalSnippets").prop('disabled', true);
15121510
});
15131511
$("#snippetImportModalConfirm").click(function () {
15141512
var snippeturl = $("#snippetImportModalContent").val();
@@ -1563,7 +1561,7 @@ $("#snippetExportModalConfirm").click(function() {
15631561
code: editor.getValue(),
15641562
visibility_level: $("#snippetExportModalVisibility").val()
15651563
};
1566-
1564+
if (!data.title || !data.file_name || !data.code || !data.visibility_level || !$("#snippetExportModalProjects").val()) return;
15671565
$("#snippetExportModalLoading").show();
15681566
var fullURL = baseURL + '/api/v3/projects/' + $("#snippetExportModalProjects").val() + '/snippets?access_token=' + accesstoken;
15691567
$.post(fullURL

‎public/views/body.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<input type="url" class="form-control" placeholder="/projects/:id/snippets/:snippet_id" id="snippetImportModalContent" disabled="disabled">
182182
</div>
183183
<div class="modal-footer">
184-
<span id="snippetImportModalLoading"><i class="fa fa-refresh fa-spin"></i></span>
184+
<span id="snippetImportModalLoading"><i class="fa fa-refresh fa-spin fa-fw"></i></span>
185185
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
186186
<button type="button" class="btn btn-danger" id="snippetImportModalClear">Clear</button>
187187
<button type="button" class="btn btn-primary" id="snippetImportModalConfirm" disabled="disabled">Import</button>
@@ -227,7 +227,7 @@
227227
</div>
228228
</div>
229229
<div class="modal-footer">
230-
<span id="snippetExportModalLoading"><i class="fa fa-refresh fa-spin"></i></span>
230+
<span id="snippetExportModalLoading"><i class="fa fa-refresh fa-spin fa-fw"></i></span>
231231
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
232232
<button type="button" class="btn btn-primary" id="snippetExportModalConfirm">Export</button>
233233
</div>

‎public/views/header.ejs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</li>
4444
<% } %>
4545
<% if(typeof gitlab !== 'undefined' && gitlab) { %>
46-
<li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#" data-toggle="modal" data-target="#snippetExportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
46+
<li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
4747
</li>
4848
<% } %>
4949
<li class="divider"></li>
@@ -55,7 +55,7 @@
5555
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
5656
</li>
5757
<% if(typeof gitlab !== 'undefined' && gitlab) { %>
58-
<li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#" data-toggle="modal" data-target="#snippetImportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
58+
<li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
5959
</li>
6060
<% } %>
6161
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>
@@ -136,7 +136,7 @@
136136
</li>
137137
<% } %>
138138
<% if(typeof gitlab !== 'undefined' && gitlab) { %>
139-
<li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#" data-toggle="modal" data-target="#snippetExportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
139+
<li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
140140
</li>
141141
<% } %>
142142
<li class="divider"></li>
@@ -148,7 +148,7 @@
148148
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
149149
</li>
150150
<% if(typeof gitlab !== 'undefined' && gitlab) { %>
151-
<li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#" data-toggle="modal" data-target="#snippetImportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
151+
<li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
152152
</li>
153153
<% } %>
154154
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>

0 commit comments

Comments
 (0)