diff options
Diffstat (limited to 'templates/content/js/com.cnprog.post.js')
| -rw-r--r-- | templates/content/js/com.cnprog.post.js | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js index 0ddc8f74..5d58ff21 100644 --- a/templates/content/js/com.cnprog.post.js +++ b/templates/content/js/com.cnprog.post.js @@ -256,11 +256,7 @@ var Vote = function(){ showMessage(object, acceptOwnAnswerMessage); } else if(data.status == "1"){ -<<<<<<< HEAD:templates/content/js/com.cnprog.post.js - object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png"); -======= object.attr("src", scriptUrl + "content/images/vote-accepted.png"); ->>>>>>> private:templates/content/js/com.cnprog.post.js $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer"); $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted"); } @@ -573,11 +569,7 @@ function createComments(type) { //todo fix url translations!!! $.ajax({ type: "POST", -<<<<<<< HEAD:templates/content/js/com.cnprog.post.js - url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"), -======= url: scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/"), ->>>>>>> private:templates/content/js/com.cnprog.post.js dataType: "json", data: { comment: textarea.val() }, success: function(json) { |