Submittage.

shazow · Aug 4, 2011 · 07ad75f · 07ad75f
1 parent be02a3a
commit 07ad75f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/static/index.html b/static/index.html
@@ -20,7 +20,7 @@
 
 <meta charset="utf-8" />
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="viewport" content="width=device-width,initial-scale=0.5,maximum-scale=0.5">
+<meta name="viewport" content="width=device-width,initial-scale=0.4,maximum-scale=0.4">
 <meta name="description" content="Ever fire up Photoshop just to multiply a couple of colors? No more." />
 
 <title>ColorBlendy - Blend colors with different modes like multiply, overlay, dodge.</title>
@@ -31,7 +31,7 @@
 </head>
 <body>
 
-<form action="#">
+<form>
 
     <div id="color-bottom-preview" class="preview">
         <h1><a href="./" tabindex="-1">ColorBlendy</a></h1>
@@ -52,6 +52,7 @@ <h1><a href="./" tabindex="-1">ColorBlendy</a></h1>
     <div id="color-top-preview" class="preview">
         <p><input type="text" id="color-top" value="#333333" tabindex="2" spellcheck="false" /></p>
     </div>
+    <input type="submit" />
 
 </form>
 

diff --git a/static/index.min.html b/static/index.min.html
@@ -20,7 +20,7 @@
 
 <meta charset="utf-8" />
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="viewport" content="width=device-width,initial-scale=0.5,maximum-scale=0.5">
+<meta name="viewport" content="width=device-width,initial-scale=0.4,maximum-scale=0.4">
 <meta name="description" content="Ever fire up Photoshop just to multiply a couple of colors? No more." />
 
 <title>ColorBlendy - Blend colors with different modes like multiply, overlay, dodge.</title>

diff --git a/static/js/core.js b/static/js/core.js
@@ -52,7 +52,10 @@ function set_mode(mode) {
 
 $(document).ready(function() {
     var r = $("form:first").submit(function() {
-        render_blend(); $('#color-blended').select(); reset_pickers(); return false;
+        render_blend(); reset_pickers();
+        body.enableTextSelect();
+        $('#color-blended').select(); 
+        return false;
     });
     $("input[readonly!=readonly]", r).change(function() {
         render_blend(); reset_pickers();
@@ -84,8 +87,7 @@ $(document).ready(function() {
             }
             o.container.show();
             active_picker = o;
-            $(this).select();
-        }).blur(function(e) {
+        }).blur(function(e){
             if(!active_picker || changing_picker) return;
             active_picker.container.hide();
             active_picker = false;
@@ -102,7 +104,9 @@ $(document).ready(function() {
             render_blend();
         });
 
-        o.add_listener('dragstart', function(e) { body.disableTextSelect(); changing_picker = true; changed_picker = true; });
+        o.add_listener('dragstart', function(e) { 
+            console.log('dragstart');
+            body.disableTextSelect(); changing_picker = true; changed_picker = true; });
         o.add_listener('dragstop', function (e) { body.enableTextSelect(); changing_picker = false; });
     });
 
@@ -138,7 +142,7 @@ $(document).ready(function() {
         } else if (e.which == 9) { // Tab
             if($(e.target).attr("tabindex") == "3") {
                 e.preventDefault();
-                $("input[tabindex=1]").focus();
+                $("input[tabindex=1]").focus(); // Prevent escaping to the chrome
             }
         }
     });