Progress

shazow · Sep 13, 2010 · 6d11830 · 6d11830
1 parent 08e57f1
commit 6d11830
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.min.*
+build
diff --git a/minify.sh b/minify.sh
@@ -3,7 +3,7 @@
 function get_size() {
     stat -f%z "$1"
 }
-target_files=(static/js/core.js static/js/colorpicker.js static/css/base.css)
+target_files=(static/js/core.js static/js/colorpicker.js static/js/jquery.disable.text.select.js static/css/base.css)
 minified=()
 
 old_total=0

diff --git a/static/css/base.css b/static/css/base.css
@@ -18,7 +18,7 @@ h1 {
     letter-spacing:0.2em;
 }
 
-select, input {
+input {
     font-size: 20px;
     width: 200px;
     text-align: center;
@@ -27,23 +27,8 @@ select, input {
     color:#888;
     border:0;
     outline:10px solid rgba(0,0,0,0.1);
-}
-
-input {
     font-family:monospace;
 }
-
-select {
-    padding:0;
-    height:185px;
-    width:215px;
-    margin-top:105px;
-    overflow: hidden;
-}
-
-select option {
-    padding:0.3em 0;
-}
 canvas {
     display: block;
 }

diff --git a/static/index.html b/static/index.html
@@ -28,37 +28,7 @@
 <link href="css/base.css" rel="stylesheet" type="text/css"/>
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script type="text/javascript" src="js/jquery.disable.text.select.js"></script>
-<script type="text/javascript" src="js/core.js"></script>
-<script type="text/javascript" src="js/colorpicker.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-    var active = $("#blend-mode li.active");
-    $("#blend-mode li").click(function(e) {
-        if(active) $(active).removeClass('active');
-        active = $(this).addClass('active');
-        render_blend();
-    });
-    $(document).keydown(function(e) {
-        if(e.which == 38 || e.which == 75) { // Down
-            $(active).prev().click();
-        } else if(e.which == 40 || e.which == 74) { // Up
-            $(active).next().click();
-        }
-    });
-    attach_colorpicker($("#color-bottom"), $("#color-bottom-preview"), function(rgb) {
-        $("#color-bottom-preview").css('background-color', rgb_to_css(rgb));
-        $("#color-bottom").val("#" + rgb_to_hex(rgb));
-        render_blend();
-    });
-    attach_colorpicker($("#color-top"), $("#color-top-preview"), function(rgb) {
-        $("#color-top-preview").css('background-color', rgb_to_css(rgb));
-        $("#color-top").val("#" + rgb_to_hex(rgb));
-        render_blend();
-    });
-    $("body").disableTextSelect();
-});
-</script>
+<script type="text/javascript" src="js/min.js"></script>
 
 </head>
 <body>

diff --git a/static/js/colorpicker.js b/static/js/colorpicker.js
@@ -186,8 +186,7 @@ function render_colorpicker(spectrumbar, pickersquare, callback) {
 
     redrawPicker(ctx,loc,col);
 
-    var sqDrag=false;
-    var pDrag=false;
+    var sqDrag=pDrag=false;
 
     $(pickersquare).click(cfun);
     $(pickersquare).mousedown(function(e) {
@@ -209,8 +208,7 @@ function render_colorpicker(spectrumbar, pickersquare, callback) {
     return function(rgb) {
         var hsv=rgb_to_hsv(rgb);
         col = (hsv[0]/0xff);
-        loc[0] = (hsv[2]/0xff)*ctx.canvas.width;
-        loc[1] = (hsv[1]/0xff)*ctx.canvas.height;
+        loc = [(hsv[2]/0xff)*ctx.canvas.width, (hsv[1]/0xff)*ctx.canvas.height];
         drawSpectrumBar(ctxb,col);
         drawPickerSquare(col);
         drawPickerCircle(ctx,loc);

diff --git a/static/js/core.js b/static/js/core.js
@@ -113,3 +113,30 @@ function render_blend() {
         alert("Unsupported color format.");
     }
 }
+
+$(document).ready(function() {
+    var active = $("#blend-mode li.active");
+    $("#blend-mode li").click(function(e) {
+        if(active) $(active).removeClass('active');
+        active = $(this).addClass('active');
+        render_blend();
+    });
+    $(document).keydown(function(e) {
+        if(e.which == 38 || e.which == 75) { // Down
+            $(active).prev().click();
+        } else if(e.which == 40 || e.which == 74) { // Up
+            $(active).next().click();
+        }
+    });
+    attach_colorpicker($("#color-bottom"), $("#color-bottom-preview"), function(rgb) {
+        $("#color-bottom-preview").css('background-color', rgb_to_css(rgb));
+        $("#color-bottom").val("#" + rgb_to_hex(rgb));
+        render_blend();
+    });
+    attach_colorpicker($("#color-top"), $("#color-top-preview"), function(rgb) {
+        $("#color-top-preview").css('background-color', rgb_to_css(rgb));
+        $("#color-top").val("#" + rgb_to_hex(rgb));
+        render_blend();
+    });
+    $("body").disableTextSelect();
+});