combine edit and apply tag script modes (#1009)

danbooru · Apr 25, 2013 · 675b48b · 675b48b
1 parent c6c5671
commit 675b48b
Show file tree

Hide file tree

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

diff --git a/app/assets/stylesheets/specific/post_mode_menu.css.scss b/app/assets/stylesheets/specific/post_mode_menu.css.scss
@@ -54,10 +54,6 @@ body.mode-add-to-pool {
   background-color: "#26A";
 }
 
-body.mode-apply-tag-script {
+body.mode-tag-script {
   background-color: "#A3A";
 }
-
-body.mode-edit-tag-script {
-  background-color: "#FFF";
-}
diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
@@ -115,14 +115,10 @@ body.mode-add-to-pool {
   background: #26A;
 }
 
-body.mode-apply-tag-script {
+body.mode-tag-script {
   background: #A3A;
 }
 
-body.mode-edit-tag-script {
-  background: white;
-}
-
 div#c-posts {
   div.notice {
     font-size: 0.8em;

diff --git a/app/views/posts/partials/index/_mode_menu.html.erb b/app/views/posts/partials/index/_mode_menu.html.erb
@@ -19,10 +19,9 @@
         <% if CurrentUser.is_janitor? %>
           <option value="approve">Approve</option>
         <% end %>
-        <option value="edit-tag-script">Edit tag script</option>
-        <option value="apply-tag-script">Apply tag script</option>
+        <option value="tag-script">Tag script</option>
       </select>
     </form>
   </section>
-  <input id="edit-tag-script" disabled></input>
+  <input id="tag-script-field"></input>
 <% end %>