Merge pull request pebble#133 from redtoad/patch-1

Fix ReferenceError when using callback.
nguyer · Mar 12, 2016 · 8593f65 · 8593f65
2 parents 7b3aad5 + 45522bc
commit 8593f65
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/js/ui/menu.js b/src/js/ui/menu.js
@@ -310,14 +310,19 @@ Menu.prototype.item = function(sectionIndex, itemIndex, item) {
   return this;
 };
 
-Menu.prototype.selection = function(callback_or_sectionIndex, itemIndex) {
-  if (typeof callback_or_sectionIndex === 'function') {
+Menu.prototype.selection = function(sectionIndex, itemIndex) {
+  var callback;
+  if (typeof sectionIndex === 'function') {
+    callback = sectionIndex;
+    sectionIndex = undefined;
+  }
+  if (callback) {
     this._selections.push(callback);
     simply.impl.menuSelection();
   } else {
     this._selection = {
-      sectionIndex: callback_or_sectionIndex,
-      itemIndex: itemIndex
+      sectionIndex: sectionIndex,
+      itemIndex: itemIndex,
     };
     this._select();
   }

diff --git a/src/simply/simply_menu.c b/src/simply/simply_menu.c
@@ -282,6 +282,9 @@ static void simply_menu_add_item(SimplyMenu *self, SimplyMenuItem *item) {
 }
 
 static MenuIndex simply_menu_get_selection(SimplyMenu *self) {
+  if (!self->menu_layer.menu_layer) {
+    return (MenuIndex) {};
+  }
   return menu_layer_get_selected_index(self->menu_layer.menu_layer);
 }