Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

1 files changed, 67 insertions, 49 deletions

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index e298c1dab..0149eca7d 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -1,29 +1,30 @@
+/** Init for Farbtastic library and page setup
+ *
+ * @package   Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
 $(document).ready(function() {
-    function UpdateColors(e) {
-        var S = f.linked;
-        var C = f.color;
-
-        if (S && S.value && S.value != C) {
-            UpdateSwatch(S);
-
-            switch (parseInt(f.linked.id.slice(-1))) {
-                case 0: default:
-                    $('body').css({'background-color':C});
-                    break;
-                case 1:
-                    $('#content').css({'background-color':C});
-                    break;
-                case 2:
-                    $('#aside_primary').css({'background-color':C});
-                    break;
-                case 3:
-                    $('body').css({'color':C});
-                    break;
-                case 4:
-                    $('a').css({'color':C});
-                    break;
-            }
-            S.value = C;
+    function UpdateColors(S) {
+        C = $(S).val();
+        switch (parseInt(S.id.slice(-1))) {
+            case 0: default:
+                $('body').css({'background-color':C});
+                break;
+            case 1:
+                $('#content').css({'background-color':C});
+                break;
+            case 2:
+                $('#aside_primary').css({'background-color':C});
+                break;
+            case 3:
+                $('body').css({'color':C});
+                break;
+            case 4:
+                $('a').css({'color':C});
+                break;
         }
     }
 
@@ -33,35 +34,52 @@ $(document).ready(function() {
     }
 
     function UpdateSwatch(e) {
-        $(e).css({
-            "background-color": e.value,
-            "color": f.hsl[2] > 0.5 ? "#000": "#fff"
-        });
+        $(e).css({"background-color": e.value,
+                  "color": f.hsl[2] > 0.5 ? "#000": "#fff"});
     }
 
-    $('#settings_design_color').append('<div id="color-picker"></div>');
-    $('#color-picker').hide();
-
-    var f = $.farbtastic('#color-picker', UpdateColors);
-    var swatches = $('#settings_design_color .swatch');
-
-    swatches
-        .each(UpdateColors)
+    function SynchColors(e) {
+        var S = f.linked;
+        var C = f.color;
 
-        .blur(function() {
-            $(this).val($(this).val().toUpperCase());
-         })
+        if (S && S.value && S.value != C) {
+            S.value = C;
+            UpdateSwatch(S);
+            UpdateColors(S);
+        }
+    }
 
-        .focus(function() {
-            $('#color-picker').show();
-            UpdateFarbtastic(this);
-        })
+    function Init() {
+        $('#settings_design_color').append('<div id="color-picker"></div>');
+        $('#color-picker').hide();
 
-        .change(function() {
-            UpdateFarbtastic(this);
-            UpdateSwatch(this);
-        }).change()
+        f = $.farbtastic('#color-picker', SynchColors);
+        swatches = $('#settings_design_color .swatch');
 
-        ;
+        swatches
+            .each(SynchColors)
+            .blur(function() {
+                $(this).val($(this).val().toUpperCase());
+             })
+            .focus(function() {
+                $('#color-picker').show();
+                UpdateFarbtastic(this);
+            })
+            .change(function() {
+                UpdateFarbtastic(this);
+                UpdateSwatch(this);
+                UpdateColors(this);
+            }).change();
+    }
 
+    var f, swatches;
+    Init();
+    $('#form_settings_design').bind('reset', function(){
+        setTimeout(function(){
+            swatches.each(function(){UpdateColors(this);});
+            $('#color-picker').remove();
+            swatches.unbind();
+            Init();
+        },10);
+    });
 });