renamed to reorderLayers, button.action set optional

uralys · Oct 30, 2019 · 3b569fa · 3b569fa
1 parent 64f81ce
commit 3b569fa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/cherry/components/button.lua b/cherry/components/button.lua
@@ -198,29 +198,31 @@ function Button:create(options)
   local SCALE = 0.8
   local scaleFrom = 1
 
-  gesture.onTap(
-    button,
-    function()
-      if (button.locked) then
-        return
-      end
-      button.locked = true
-      animation.touchEffect(
-        button,
-        {
-          scaleTo = SCALE,
-          scaleFrom = scaleFrom,
-          onComplete = function()
-            if (button.scale) then
-              button:scale(scaleFrom / SCALE, scaleFrom / SCALE)
-              button.locked = false
-              timer.performWithDelay(10, options.action)
+  if (options.action) then
+    gesture.onTap(
+      button,
+      function()
+        if (button.locked) then
+          return
+        end
+        button.locked = true
+        animation.touchEffect(
+          button,
+          {
+            scaleTo = SCALE,
+            scaleFrom = scaleFrom,
+            onComplete = function()
+              if (button.scale) then
+                button:scale(scaleFrom / SCALE, scaleFrom / SCALE)
+                button.locked = false
+                timer.performWithDelay(10, options.action)
+              end
             end
-          end
-        }
-      )
-    end
-  )
+          }
+        )
+      end
+    )
+  end
 
   return button
 end

diff --git a/cherry/core/app.lua b/cherry/core/app.lua
@@ -68,7 +68,7 @@ local App = {
   transversalFrontLayer = display.newGroup(),
   hud = display.newGroup(),
   -----------------------------------------
-  resetLayers = function()
+  reorderLayers = function()
     App.transversalBackLayer:toBack()
     Background:toBack()
     App.transversalFrontLayer:toFront()

diff --git a/cherry/core/router.lua b/cherry/core/router.lua
@@ -13,7 +13,7 @@ local Router = {
 --------------------------------------------------------------------------------
 
 function Router:resetScreen()
-  App.resetLayers()
+  App.reorderLayers()
   if (Screen.reset) then
     Screen:reset()
   end