UI: Fixes for repo topic editor (#5971)

- Properly hides the edit interface when saving a empty topic list
- Align the Done button with the edit box
tokarchuk/v1.17
silverwind 6 years ago committed by Lauris BH
parent 1772893505
commit 2ec9bf9048
  1. 15
      public/js/index.js
  2. 2
      templates/repo/home.tmpl

@ -2635,16 +2635,15 @@ function initTopicbar() {
}, function(data, textStatus, xhr){ }, function(data, textStatus, xhr){
if (xhr.responseJSON.status === 'ok') { if (xhr.responseJSON.status === 'ok') {
viewDiv.children(".topic").remove(); viewDiv.children(".topic").remove();
if (topics.length === 0) { if (topics.length) {
return var topicArray = topics.split(",");
}
var topicArray = topics.split(",");
var last = viewDiv.children("a").last(); var last = viewDiv.children("a").last();
for (var i=0; i < topicArray.length; i++) { for (var i=0; i < topicArray.length; i++) {
$('<div class="ui green basic label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last) $('<div class="ui green basic label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last)
}
} }
editDiv.css('display', 'none'); // hide Semantic UI Grid editDiv.css('display', 'none');
viewDiv.show(); viewDiv.show();
} }
}).fail(function(xhr){ }).fail(function(xhr){

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="two wide column"> <div class="two wide column">
<a class="ui compact button primary" href="javascript:;" id="save_topic" <a class="ui button primary" href="javascript:;" id="save_topic"
data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a> data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a>
</div> </div>
</div> </div>

Loading…
Cancel
Save