Merge pull request ipython#8131 from minrk/sort-help

takluyver · takluyver · commit befcaa9a6188 · 2015-03-23T18:06:28.000-07:00
handle undefined when sorting quick help
diff --git a/IPython/html/static/base/js/keyboard.js b/IPython/html/static/base/js/keyboard.js
@@ -244,13 +244,13 @@ define([
             }
         }
         help.sort(function (a, b) {
-            if (a.help_index > b.help_index){
-                return 1;
+            if (a.help_index === b.help_index) {
+                return 0;
             }
-            if (a.help_index < b.help_index){
-                return -1;
+            if (a.help_index === undefined || a.help_index > b.help_index){
+                return 1;
             }
-            return 0;
+            return -1;
         });
         return help;
     };

Original file line number	Diff line number	Diff line change
`@@ -244,13 +244,13 @@ define([`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`help.sort(function (a, b) {`
`247`		`- if (a.help_index > b.help_index){`
`248`		`- return 1;`
	`247`	`+ if (a.help_index === b.help_index) {`
	`248`	`+ return 0;`
`249`	`249`	`}`
`250`		`- if (a.help_index < b.help_index){`
`251`		`- return -1;`
	`250`	`+ if (a.help_index === undefined \|\| a.help_index > b.help_index){`
	`251`	`+ return 1;`
`252`	`252`	`}`
`253`		`- return 0;`
	`253`	`+ return -1;`
`254`	`254`	`});`
`255`	`255`	`return help;`
`256`	`256`	`};`