From owner-svn-src-head@freebsd.org Wed Feb 21 05:04:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 084B7F040CC; Wed, 21 Feb 2018 05:04:59 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AAA7285F3D; Wed, 21 Feb 2018 05:04:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4FF91401F; Wed, 21 Feb 2018 05:04:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1L54wQi015719; Wed, 21 Feb 2018 05:04:58 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1L54wa8015716; Wed, 21 Feb 2018 05:04:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802210504.w1L54wa8015716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 05:04:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329700 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329700 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2018 05:04:59 -0000 Author: kevans Date: Wed Feb 21 05:04:58 2018 New Revision: 329700 URL: https://svnweb.freebsd.org/changeset/base/329700 Log: lualoader: Allow carousel 'items' to be a table as well as a function We don't have any in-tree users of this, but for a static set of carousel options having to define a callback is excessive. Modified: head/stand/lua/drawer.lua head/stand/lua/menu.lua Modified: head/stand/lua/drawer.lua ============================================================================== --- head/stand/lua/drawer.lua Wed Feb 21 04:48:37 2018 (r329699) +++ head/stand/lua/drawer.lua Wed Feb 21 05:04:58 2018 (r329700) @@ -190,8 +190,10 @@ drawer.menu_name_handlers = { [core.MENU_CAROUSEL_ENTRY] = function(drawing_menu, entry) local carid = entry.carousel_id local caridx = config.getCarouselIndex(carid) - local choices = entry.items() - + local choices = entry.items + if type(choices) == "function" then + choices = choices() + end if #choices < caridx then caridx = 1 end Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Wed Feb 21 04:48:37 2018 (r329699) +++ head/stand/lua/menu.lua Wed Feb 21 05:04:58 2018 (r329700) @@ -65,8 +65,10 @@ menu.handlers = { -- carousel (rotating) functionality local carid = entry.carousel_id local caridx = config.getCarouselIndex(carid) - local choices = entry.items() - + local choices = entry.items + if type(choices) == "function" then + choices = choices() + end if #choices > 0 then caridx = (caridx % #choices) + 1 config.setCarouselIndex(carid, caridx)