combine edit and apply tag script modes (#1009)

This commit is contained in:
Toks
2013-04-24 20:37:44 -04:00
parent c6c5671c44
commit 675b48bdd8
4 changed files with 12 additions and 28 deletions

View File

@@ -6,7 +6,7 @@
this.initialize_selector(); this.initialize_selector();
this.initialize_preview_link(); this.initialize_preview_link();
this.initialize_edit_form(); this.initialize_edit_form();
this.initialize_edit_tag_script_field(); this.initialize_tag_script_field();
Danbooru.PostModeMenu.change(); Danbooru.PostModeMenu.change();
} }
} }
@@ -53,19 +53,16 @@
}); });
} }
Danbooru.PostModeMenu.initialize_edit_tag_script_field = function() { Danbooru.PostModeMenu.initialize_tag_script_field = function() {
$("#edit-tag-script").on("keydown.return blur", function(e) { $("#tag-script-field").blur(function(e) {
var script = $(this).val(); var script = $(this).val();
if (script) { if (script) {
Danbooru.Cookie.put("tag-script", script); Danbooru.Cookie.put("tag-script", script);
$("#mode-box select").val("apply-tag-script");
} else { } else {
$("#mode-box select").val("view"); $("#mode-box select").val("view");
Danbooru.PostModeMenu.change(e);
} }
Danbooru.PostModeMenu.change(e);
}); });
} }
@@ -80,16 +77,12 @@
$body.addClass("mode-" + s); $body.addClass("mode-" + s);
Danbooru.Cookie.put("mode", s, 1); Danbooru.Cookie.put("mode", s, 1);
if (s === "edit-tag-script") { if (s === "tag-script") {
var script = Danbooru.Cookie.get("tag-script"); var script = Danbooru.Cookie.get("tag-script");
$("#edit-tag-script").removeAttr("disabled").val(script).show().focus(); $("#tag-script-field").val(script).show().focus().selectEnd();
} else if (s === "apply-tag-script") {
var script = Danbooru.Cookie.get("tag-script");
$("#edit-tag-script").show().val(script).attr("disabled", "disabled");
} else { } else {
$("#edit-tag-script").hide(); $("#tag-script-field").hide();
} }
} }
@@ -126,7 +119,7 @@
Danbooru.Post.update(post_id, {"post[is_note_locked]": "1"}); Danbooru.Post.update(post_id, {"post[is_note_locked]": "1"});
} else if (s === 'approve') { } else if (s === 'approve') {
Danbooru.Post.approve(post_id); Danbooru.Post.approve(post_id);
} else if (s === "apply-tag-script") { } else if (s === "tag-script") {
var tag_script = Danbooru.Cookie.get("tag-script"); var tag_script = Danbooru.Cookie.get("tag-script");
Danbooru.TagScript.run(post_id, tag_script); Danbooru.TagScript.run(post_id, tag_script);
} else { } else {

View File

@@ -54,10 +54,6 @@ body.mode-add-to-pool {
background-color: "#26A"; background-color: "#26A";
} }
body.mode-apply-tag-script { body.mode-tag-script {
background-color: "#A3A"; background-color: "#A3A";
} }
body.mode-edit-tag-script {
background-color: "#FFF";
}

View File

@@ -115,14 +115,10 @@ body.mode-add-to-pool {
background: #26A; background: #26A;
} }
body.mode-apply-tag-script { body.mode-tag-script {
background: #A3A; background: #A3A;
} }
body.mode-edit-tag-script {
background: white;
}
div#c-posts { div#c-posts {
div.notice { div.notice {
font-size: 0.8em; font-size: 0.8em;

View File

@@ -19,10 +19,9 @@
<% if CurrentUser.is_janitor? %> <% if CurrentUser.is_janitor? %>
<option value="approve">Approve</option> <option value="approve">Approve</option>
<% end %> <% end %>
<option value="edit-tag-script">Edit tag script</option> <option value="tag-script">Tag script</option>
<option value="apply-tag-script">Apply tag script</option>
</select> </select>
</form> </form>
</section> </section>
<input id="edit-tag-script" disabled></input> <input id="tag-script-field"></input>
<% end %> <% end %>