From 4598284bbb19caf743628bf8f23ae9540642454d Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Wed, 17 Feb 2016 09:41:17 -0800
Subject: [PATCH] fix(readerfontlight): crash in toggle

---
 .../apps/reader/modules/readerfrontlight.lua  |  2 +-
 frontend/ui/widget/inputdialog.lua            | 24 +++++++++++--------
 utils/wbuilder.lua                            |  1 -
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/frontend/apps/reader/modules/readerfrontlight.lua b/frontend/apps/reader/modules/readerfrontlight.lua
index df28e03f9..ee5ee71e2 100644
--- a/frontend/apps/reader/modules/readerfrontlight.lua
+++ b/frontend/apps/reader/modules/readerfrontlight.lua
@@ -93,7 +93,7 @@ function ReaderFrontLight:onShowFlDialog()
                     text = _("Toggle"),
                     enabled = true,
                     callback = function()
-                        self.fl_dialog.input:setText("")
+                        self.fl_dialog:setInputText("")
                         powerd:toggleFrontlight()
                     end,
                 },
diff --git a/frontend/ui/widget/inputdialog.lua b/frontend/ui/widget/inputdialog.lua
index 8e8b6a395..247818f60 100644
--- a/frontend/ui/widget/inputdialog.lua
+++ b/frontend/ui/widget/inputdialog.lua
@@ -57,7 +57,7 @@ function InputDialog:init()
             width = self.width,
         }
     }
-    self.input_widget = InputText:new{
+    self._input_widget = InputText:new{
         text = self.input,
         hint = self.input_hint,
         face = self.input_face,
@@ -99,9 +99,9 @@ function InputDialog:init()
             CenterContainer:new{
                 dimen = Geom:new{
                     w = self.title_bar:getSize().w,
-                    h = self.input_widget:getSize().h,
+                    h = self._input_widget:getSize().h,
                 },
-                self.input_widget,
+                self._input_widget,
             },
             -- buttons
             CenterContainer:new{
@@ -117,12 +117,20 @@ function InputDialog:init()
     self[1] = CenterContainer:new{
         dimen = Geom:new{
             w = Screen:getWidth(),
-            h = Screen:getHeight() - self.input_widget:getKeyboardDimen().h,
+            h = Screen:getHeight() - self._input_widget:getKeyboardDimen().h,
         },
         self.dialog_frame,
     }
 end
 
+function InputDialog:getInputText()
+    return self._input_widget:getText()
+end
+
+function InputDialog:setInputText(text)
+    self._input_widget:setText(text)
+end
+
 function InputDialog:onShow()
     UIManager:setDirty(self, function()
         return "ui", self.dialog_frame.dimen
@@ -136,15 +144,11 @@ function InputDialog:onCloseWidget()
 end
 
 function InputDialog:onShowKeyboard()
-    self.input_widget:onShowKeyboard()
-end
-
-function InputDialog:getInputText()
-    return self.input_widget:getText()
+    self._input_widget:onShowKeyboard()
 end
 
 function InputDialog:onClose()
-    self.input_widget:onCloseKeyboard()
+    self._input_widget:onCloseKeyboard()
 end
 
 return InputDialog
diff --git a/utils/wbuilder.lua b/utils/wbuilder.lua
index eb03deea1..c6122d004 100755
--- a/utils/wbuilder.lua
+++ b/utils/wbuilder.lua
@@ -31,7 +31,6 @@ local FrameContainer = require("ui/widget/container/framecontainer")
 local AlphaContainer = require("ui/widget/container/alphacontainer")
 local ConfirmBox = require("ui/widget/confirmbox")
 local TouchMenu = require("ui/widget/touchmenu")
-local InputText = require("ui/widget/inputtext")
 local DocumentRegistry = require("document/documentregistry")
 local ReaderUI = require("apps/reader/readerui")
 local DEBUG = require("dbg")