diff options
author | fox <[email protected]> | 2018-12-03 05:03:01 +0000 |
---|---|---|
committer | Gogs <[email protected]> | 2018-12-03 05:03:01 +0000 |
commit | d3f31de0429c2679fb856d4e48fcf959e61dfcc8 (patch) | |
tree | 7a51b4268b1697d11ed05843e46561e795049f67 | |
parent | 5ead558e435dd8d58f6666b445374b0005a60337 (diff) | |
parent | 6f9307aa9a1a9b35773ca1b2b5a8f151b911ec3d (diff) |
Merge branch 'fix-edit-tags-onclick' of wn/tt-rss into js-objects
-rwxr-xr-x | classes/feeds.php | 2 | ||||
-rw-r--r-- | classes/pref/labels.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 3c6c20f26..58d4f68d9 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -633,7 +633,7 @@ class Feeds extends Handler_Protected { $tmp_content .= "<img src='images/tag.png' alt='Tags' title='Tags'> <span id=\"ATSTR-$id\">$tags_str</span> <a title=\"".__('Edit tags for this article')."\" - href=\"#\" onclick=\"Article.editArticleTags($id)\">(+)</a>"; + href=\"#\" onclick=\"Article.editTags($id)\">(+)</a>"; $num_comments = (int) $line["num_comments"]; $entry_comments = ""; diff --git a/classes/pref/labels.php b/classes/pref/labels.php index c52f8bd79..49118ab4a 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -275,7 +275,7 @@ class Pref_Labels extends Handler_Protected { dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; - print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">". + print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">". __('Create label')."</button dojoType=\"dijit.form.Button\"> "; print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">". @@ -323,4 +323,4 @@ class Pref_Labels extends Handler_Protected { print "</div>"; #container } -}
\ No newline at end of file +} |