diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 18:20:11 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 18:20:11 -0700 |
| commit | 9a6a404a3239c964528b501d3c187ead84b1f7a0 (patch) | |
| tree | d41c71fe75f13d599cf07a5d300e486fb61c1ad8 | |
| parent | 301754db7365262804a40a59d4cbf277d7d1085e (diff) | |
| parent | b976f9b3665771444c30e914fe21cbce5848bd21 (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/tag/js/tag.js | 4 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 17845272..532ada95 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -37,7 +37,7 @@ function editInPlace(element) { closeEditInPlaceForms(); // create edit form - var tag_id = $(this).attr('id').substr(5); + var tag_id = $(this).attr('rel'); var tag_name = $(this).html(); var tag_width = $(this).width(); $(this).parent().data("revert", $(this).parent().html()); @@ -64,7 +64,7 @@ function editInPlace(element) { success: function(data) { if (data.result == "success") { closeEditInPlaceForms(); // close form - $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname + $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname console.log(data); window.location.reload(); } else if (data.result == "error") { diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index edc466bb..2d41ee5f 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -47,7 +47,7 @@ <? endif ?> <li> - <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span> + <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> <span class="g-understate">(<?= $tag->count ?>)</span> <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="g-dialog-link g-delete-link g-button"> |