From: dsc <dsc@wikimedia.org>
Date: Fri, 30 Mar 2012 00:17:22 +0000 (-0700)
Subject: Fixes errant fragment identifiers from buttons.
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=872bdd3ad6b03463512ab7c63cf3b10ddd83d59d;p=limn.git

Fixes errant fragment identifiers from buttons.
---

diff --git a/lib/graph/graph-edit-view.co b/lib/graph/graph-edit-view.co
index dfcbbe0..6151007 100644
--- a/lib/graph/graph-edit-view.co
+++ b/lib/graph/graph-edit-view.co
@@ -11,6 +11,12 @@ _ = require 'kraken/util/underscore'
 } = require 'kraken/graph/graph-model'
 
 
+/**
+ * Helper that wraps a function to return false.
+ */
+stopEventAnd = (fn) ->
+    ~> fn ...; false
+
 
 
 
@@ -26,10 +32,9 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
         valueFormatter xValueFormatter yValueFormatter
     ]>
     __bind__  : <[ 
-        render renderAll resizeViewport
+        render renderAll stopAndRender stopAndRenderAll resizeViewport
         numberFormatter numberFormatterHTML
-        onReady onSync
-        onModelChange onScaffoldChange onFirstClickRenderOptionsTab
+        onReady onSync onModelChange onScaffoldChange onFirstClickRenderOptionsTab
     ]>
     __debounce__: <[ render renderAll ]>
     ctorName  : 'GraphEditView'
@@ -38,9 +43,10 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
     template  : require 'kraken/template/graph-edit'
     
     events:
-        'click    .redraw-button'                  : 'render'
-        'click    .save-button'                    : 'save'
+        'click    .redraw-button'                  : 'stopAndRender'
         'click    .load-button'                    : 'load'
+        'click    .save-button'                    : 'save'
+        'click    .done-button'                    : 'done'
         'keypress form.details input[type="text"]' : 'onKeypress'
         'keypress form.options .value'             : 'onKeypress'
         'submit   form.details'                    : 'onDetailsSubmit'
@@ -96,12 +102,16 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
     load: ->
         console.log "#this.load!"
         @model.fetch()
+        false
     
     save: ->
         console.log "#this.save!"
         id = @model.id or @model.get('slug')
         @model.save {id}, {+wait}
+        false
     
+    done: ->
+        @save()
     
     change: ->
         @model.change()
@@ -221,7 +231,7 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
         
         @updateURL()
         @trigger 'render', this
-        this
+        false
     
     renderAll: ->
         return this unless @ready
@@ -229,7 +239,6 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
         _.invoke @scaffold.subviews, 'render'
         @scaffold.render()
         @render()
-        this
     
     /**
      * Update the page URL using HTML5 History API
@@ -280,6 +289,7 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
     ### }}}
     ### Event Handlers {{{
     
+    
     onReady: ->
         console.log "(#this via GraphEditView).ready!"
         @ready = @scaffold.ready = true
@@ -338,6 +348,15 @@ GraphEditView = exports.GraphEditView = BaseView.extend do # {{{
         @render()
         false
     
+    # Needed because (sigh) _.debounce returns undefined
+    stopAndRender: ->
+        @render ...
+        false
+    
+    stopAndRenderAll: ->
+        @renderAll ...
+        false
+    
     # }}}
     
     toString: -> "#{@ctorName}(#{@model})"
diff --git a/www/presets/root.yaml b/www/presets/root.yaml
index 61776ef..1c4963a 100644
--- a/www/presets/root.yaml
+++ b/www/presets/root.yaml
@@ -15,7 +15,7 @@ options   :
     axisLabelFontSize               : 14
     axisLabelFormatter              : null
     axisLabelWidth                  : 50
-    axisLineColor                   : black
+    axisLineColor                   : "#AAAAAA"
     axisLineWidth                   : 0.3
     axisTickSize                    : 3.0
     colorSaturation                 : 1.0