summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gallery.in_place_edit.js5
-rw-r--r--modules/g2_import/helpers/g2_import_task.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/gallery.in_place_edit.js b/lib/gallery.in_place_edit.js
index 681688e5..c10400e3 100644
--- a/lib/gallery.in_place_edit.js
+++ b/lib/gallery.in_place_edit.js
@@ -10,6 +10,10 @@
},
_show: function(target) {
+ if ($(this).data("gallery_in_place_edit") == true) {
+ return;
+ }
+ $(this).data("gallery_in_place_edit", true);
var self = this;
var tag_width = $(target).width();
$(self).data("tag_width", tag_width);
@@ -42,6 +46,7 @@
$(parent).find("form").remove();
$(parent).children().show();
$("#g-in-place-edit-message").remove();
+ $(this).data("gallery_in_place_edit", false);
},
_ajaxify_edit: function() {
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index 21ba4c3a..e0212b33 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -189,7 +189,7 @@ class g2_import_task_Core {
}
$task->status = t(
"Album highlights (%count of %total)",
- array("count" => $done["tags"] + 1, "total" => $stats["albums"]));
+ array("count" => $done["highlights"] + 1, "total" => $stats["highlights"]));
break;