Queue all

georg94 · Aug 1, 2013 · d7a7c48 · d7a7c48
1 parent 4531425
commit d7a7c48
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 22 deletions.
diff --git a/_assets/speedy.coffee b/_assets/speedy.coffee
@@ -7,6 +7,8 @@ $.fn.speedy = (result_selector) ->
   result_selector ?= ".result"
 
   search = (keyword) ->
+    $(".add-all").toggle( !!keyword )
+
     unless window.speedy_keyword == keyword
       window.speedy_keyword = keyword
       if keyword.length
@@ -18,15 +20,18 @@ $.fn.speedy = (result_selector) ->
         $(result_selector).show()
 
   $input.on "search keyup", -> 
-      search( $(this).val() )
-      location.hash = $(this).val()
+    search( $(this).val() )
+    location.hash = $(this).val()
 
   $(".group").click ->
     search $(this).attr("href").substr(1)
 
   if location.hash.length
     search $input.val(location.hash.substr(1)).val()
+  else
+    search ""
 
   $(".speedy-remover").click ->
     $input.val("")
-    $(result_selector).show()
+    $(result_selector).show()
+    search (location.hash = "")
diff --git a/_assets/stuff.coffee b/_assets/stuff.coffee
@@ -6,8 +6,13 @@ $ ->
       i.selectionStart = 0
       i.selectionEnd = i.value.length
 
-  $("li img").on "click", ->
+  $(".add-all").click ->
+    $("li:visible img").click()
+
+  $.fn.addToStoryLine = ->
     $(this).clone().appendTo(".story").click ->
       $(this).remove()
       $(".queue").val $.map( $(".story img"), (e) -> ":" + $(e).attr("title") + ":" ).join("")
-    $(".queue").val $.map( $(".story img"), (e) -> ":" + $(e).attr("title") + ":" ).join("")
+    $(".queue").val $.map( $(".story img"), (e) -> ":" + $(e).attr("title") + ":" ).join("")
+
+  $("li img").on "click", -> $(this).addToStoryLine()
diff --git a/_assets/style.scss b/_assets/style.scss
@@ -22,9 +22,13 @@ header, footer {
 }
 
 section {
-  background-color: #f6f6f6;
+  width: 100%;
+  max-width: 900px;
+  margin: 0 auto;
   text-align: center;
-  padding: 20px 0;
+  padding: 20px;
+  &.list {
+  }
   &.tell-me-a-story {
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px;
@@ -33,19 +37,17 @@ section {
 
 a {
   text-decoration: none;
+  cursor: pointer;
   color: #469;
   padding: 0 10px;
   font-weight: bold;
   img { width: 16px; height: 16px; }
 }
 
 ul {
-  width: 100%;
-  margin: 0 auto;
   text-align: left;
-  max-width: 900px;
-  padding: 0 20px;
 }
+
 .plain {
   @include appearance(none);
   border: 0;
@@ -59,7 +61,7 @@ ul {
 li {
   @include inline-block;
   margin: 0;
-  width: 140px;
+  width: 160px;
   padding: 8px 0;
   overflow: hidden;
   white-space: nowrap;

diff --git a/index.html b/index.html
@@ -25,6 +25,7 @@
   <a class="speedy-remover"><img src="/emojis/x.png" /></a>
 </section>
 <section class="list">
+  <a class="add-all">Queue all</a>
   <ul>
     {% for emoji in site.emojis %}
       <li class="result">

diff --git a/javascripts/speedy.js b/javascripts/speedy.js
diff --git a/javascripts/stuff.js b/javascripts/stuff.js
diff --git a/stylesheets/style.css b/stylesheets/style.css
@@ -23,15 +23,18 @@ header, footer {
   text-align: center; }
 
 section {
-  background-color: #f6f6f6;
+  width: 100%;
+  max-width: 900px;
+  margin: 0 auto;
   text-align: center;
-  padding: 20px 0; }
+  padding: 20px; }
   section.tell-me-a-story {
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px; }
 
 a {
   text-decoration: none;
+  cursor: pointer;
   color: #469;
   padding: 0 10px;
   font-weight: bold; }
@@ -40,11 +43,7 @@ a {
     height: 16px; }
 
 ul {
-  width: 100%;
-  margin: 0 auto;
-  text-align: left;
-  max-width: 900px;
-  padding: 0 20px; }
+  text-align: left; }
 
 .plain {
   -webkit-appearance: none;
@@ -66,7 +65,7 @@ li {
   *display: inline;
   *vertical-align: auto;
   margin: 0;
-  width: 140px;
+  width: 160px;
   padding: 8px 0;
   overflow: hidden;
   white-space: nowrap; }