do not execute onclick after sortable

if segment is only enabled segment, and label clicked, enable all others
aliemam · Mar 30, 2012 · cd72aeb · cd72aeb
1 parent dcf0b86
commit cd72aeb
Showing 1 changed file with 54 additions and 11 deletions.
diff --git a/src/js/Rickshaw.Graph.Behavior.Series.Toggle.js b/src/js/Rickshaw.Graph.Behavior.Series.Toggle.js
@@ -26,24 +26,67 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
                 var label = line.element.getElementsByTagName('span')[0];
                 label.onclick = function(e){
 
-                        // these must happen first or else we try ( and probably fail ) to make a no line graph
-                        line.series.enable();
-                        line.element.classList.remove('disabled');
-
-                        self.legend.lines.forEach(function(l){
-                                if (line.series === l.series) {
-                                        // noop
-                                } else {
-                                        l.series.disable();
-                                        l.element.classList.add('disabled');
+                        var disableAllOtherLines = line.series.disabled;
+                        if ( ! disableAllOtherLines ) {
+                                for ( var i = 0; i < self.legend.lines.length; i++ ) {
+                                        var l = self.legend.lines[i];
+                                        if ( line.series === l.series ) {
+                                                // noop
+                                        } else if ( l.series.disabled ) {
+                                                // noop
+                                        } else {
+                                                disableAllOtherLines = true;
+                                                break;
+                                        }
                                 }
-                        });
+                        }
+
+                        // show all or none
+                        if ( disableAllOtherLines ) {
+
+                                // these must happen first or else we try ( and probably fail ) to make a no line graph
+                                line.series.enable();
+                                line.element.classList.remove('disabled');
+
+                                self.legend.lines.forEach(function(l){
+                                        if ( line.series === l.series ) {
+                                                // noop
+                                        } else {
+                                                l.series.disable();
+                                                l.element.classList.add('disabled');
+                                        }
+                                });
+
+                        } else {
+
+                                self.legend.lines.forEach(function(l){
+                                        l.series.enable();
+                                        l.element.classList.remove('disabled');
+                                });
+
+                        }
+
                 };
 
 	};
 
 	if (this.legend) {
 
+                $(this.legend.list).sortable( {
+                        start: function(event, ui) {
+                                ui.item.bind('no.onclick',
+                                        function(event) {
+                                                event.preventDefault();
+                                        }
+                                );
+                        },
+                        stop: function(event, ui) {
+                                setTimeout(function(){
+                                        ui.item.unbind('no.onclick');
+                                }, 250);
+                        }
+                })
+
 		this.legend.lines.forEach( function(l) {
 			self.addAnchor(l);
 		} );