From 94ad9d6e698d0bd3d767728992c40f8b4d50ca53 Mon Sep 17 00:00:00 2001 From: Peter Schojer Date: Tue, 7 Oct 2008 13:14:32 +0000 Subject: [PATCH] cleanup --- .../ExtJS/samples/Picross/src/PicrossFrame.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/WebWidgets/ExtJS/samples/Picross/src/PicrossFrame.cpp b/WebWidgets/ExtJS/samples/Picross/src/PicrossFrame.cpp index 76f013b29..03244dc2b 100644 --- a/WebWidgets/ExtJS/samples/Picross/src/PicrossFrame.cpp +++ b/WebWidgets/ExtJS/samples/Picross/src/PicrossFrame.cpp @@ -47,14 +47,7 @@ void PicrossFrame::setupJavaScript(Page* pPage) { { std::ostringstream str; - str << "function handleRightClick(elem, val) {" << std::endl; - str << "handleClick(elem, val, false);" << std::endl; - str << "}"; - pPage->addDynamicFunction(str.str()); - } - { - std::ostringstream str; - str << "function handleClick(elem, val, leftClick) {" << std::endl; + str << "function handleClick(elem, val, guessSet) {" << std::endl; str << "if (val == 'O'){" << std::endl; str << "elem.innerHTML = '\"\"';" << std::endl; @@ -62,12 +55,12 @@ void PicrossFrame::setupJavaScript(Page* pPage) str << "else {" << std::endl; str << "elem.innerHTML = '\"\"';" << std::endl; - str << "if (leftClick){" << std::endl; // left mouse click means the user guesses there is an entry + str << "if (guessSet){" << std::endl; // means the user guesses there is an entry str << "if (val != 'O') {" << std::endl; str << "Ext.Msg.alert('Error', 'You guessed wrong');" << std::endl; str << "}" << std::endl; str << "}" << std::endl; - str << "else if (e.button == 2){" << std::endl; + str << "else {" << std::endl; str << "if (val == 'O') {" << std::endl; str << "Ext.Msg.alert('Error', 'You guessed wrong');" << std::endl; str << "}" << std::endl; @@ -94,7 +87,7 @@ void PicrossFrame::setupJavaScript(Page* pPage) str << "var rec = grid.store.getAt(row);" << std::endl; str << "var val = rec.get(''+col);" << std::endl; str << "var html = grid.getView().getCell(row,col);" << std::endl; - str << "handleClick(html.firstChild, val, (e.button == 0));" << std::endl; + str << "handleClick(html.firstChild, val, true);" << std::endl; str << "}" << std::endl; _pGameTable->cellClicked.add(jsDelegate(str.str())); }