]> git.scottworley.com Git - picsort/commitdiff
projects / picsort / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 01dd048)
'c' to Call a picture something or Change its name
authorScott Worley <scottworley@scottworley.com>
Fri, 28 Feb 2014 09:57:37 +0000 (01:57 -0800)
committerScott Worley <scottworley@scottworley.com>
Fri, 28 Feb 2014 09:57:37 +0000 (01:57 -0800)
picsorter.css patch | blob | blame | history
picsorter.html patch | blob | blame | history
picsorter.js patch | blob | blame | history

diff --git a/picsorter.css b/picsorter.css
index b99fc9e334a5be1cb9cdbc27a0eb45d187ad53bd..78e0d791feb9e66760f6fc9093e4599cba87609c 100644 (file)
--- a/picsorter.css
+++ b/picsorter.css
@@ -19,6 +19,17 @@
   background-color: rgba(200,200,200,0.5);
 }
 
   background-color: rgba(200,200,200,0.5);
 }
 
+#namecontainer {
+  position: fixed;
+  width: 100%;
+}
+#name {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  font-size: 30pt;
+}
+
 .fade {
   opacity: 0;
   animation-duration: 2s;
 .fade {
   opacity: 0;
   animation-duration: 2s;
diff --git a/picsorter.html b/picsorter.html
index f60906069b1be2e157c6142fa8b2392148afa62f..ef41f4f6bf8b00edb63fe88b5a5213b7d55c156f 100644 (file)
--- a/picsorter.html
+++ b/picsorter.html
@@ -8,6 +8,7 @@
   </head>
   <body>
     <div id="message" class="fade">Welcome to picsorter</div>
   </head>
   <body>
     <div id="message" class="fade">Welcome to picsorter</div>
+    <div id="namecontainer"><input id="name" type="text"></input></div>
     <img id="pic"></img>
   </body>
 </html>
     <img id="pic"></img>
   </body>
 </html>
diff --git a/picsorter.js b/picsorter.js
index db313d9d382493e930fdec1c5bdf227adc647193..70cd2367e7839d26638bb4a6cf3bf1b4daba57a7 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -45,7 +45,7 @@ function move_to_nondeleted(direction) {
   do {
     input_index += direction;
   } while (picinfo[files[input_index]].deleted);
   do {
     input_index += direction;
   } while (picinfo[files[input_index]].deleted);
-  say(input_index);
+  say(input_index + " " + (picinfo[files[input_index]].name || ""));
   setpic();
 }
 
   setpic();
 }
 
@@ -70,7 +70,17 @@ function change_exposure(amount) {
   say((display_exposure >= 0 ? "+" : "") + display_exposure);
 }
 
   say((display_exposure >= 0 ? "+" : "") + display_exposure);
 }
 
+function set_name() {
+  var name_input = $("#name").hide().get(0);
+  var name = name_input.value;
+  name_input.value = "";
+  picinfo[files[input_index]].name = name;
+  save_picinfo();
+  say("Named " + name);
+}
+
 $(function() {
 $(function() {
+  $("#name").hide().on("keyup", function(e) { e.which == 13 && set_name(); });
   move_to_nondeleted(1);
 });
 
   move_to_nondeleted(1);
 });
 
@@ -84,3 +94,4 @@ Mousetrap.bind('b', function() { change_exposure(1); });
 Mousetrap.bind('d', function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('d', function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
+Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });
Ad hoc personal picture sorter