yumoqing/kivyblocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2021-06-07 09:57:59 +08:00
parent 703845b20d
commit 2dc50fc08c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kivyblocks/blocks.py
View File

@ -408,10 +408,6 @@ class Blocks(EventDispatcher):
def blocksAction(self,widget,desc, *args): def blocksAction(self,widget,desc, *args):
target = Blocks.getWidgetById(desc.get('target','self'),widget) target = Blocks.getWidgetById(desc.get('target','self'),widget)
if target is None:
Logger.info('Block: blocksAction():desc(%s) target not found',
str(desc))
return
add_mode = desc.get('mode','replace') add_mode = desc.get('mode','replace')
opts = desc.get('options').copy() opts = desc.get('options').copy()
d = self.getActionData(widget,desc) d = self.getActionData(widget,desc)
@ -420,9 +416,10 @@ class Blocks(EventDispatcher):
p.update(d) p.update(d)
opts['options'] = p opts['options'] = p
def doit(target,add_mode,o,w): def doit(target,add_mode,o,w):
if add_mode == 'replace': if target:
target.clear_widgets() if add_mode == 'replace':
target.add_widget(w) target.clear_widgets()
target.add_widget(w)
def doerr(o,e): def doerr(o,e):
Logger.info('Block: blocksAction(): desc=%s widgetBuild error' Logger.info('Block: blocksAction(): desc=%s widgetBuild error'
@ -436,10 +433,6 @@ class Blocks(EventDispatcher):
def urlwidgetAction(self,widget,desc, *args): def urlwidgetAction(self,widget,desc, *args):
target = Blocks.getWidgetById(desc.get('target','self'),widget) target = Blocks.getWidgetById(desc.get('target','self'),widget)
if target is None:
Logger.info('Block: urlwidgetAction():desc(%s) target not found',
str(desc))
return
add_mode = desc.get('mode','replace') add_mode = desc.get('mode','replace')
opts = desc.get('options').copy() opts = desc.get('options').copy()
p = opts.get('params',{}).copy() p = opts.get('params',{}).copy()
@ -455,9 +448,10 @@ class Blocks(EventDispatcher):
} }
def doit(target,add_mode,o,w): def doit(target,add_mode,o,w):
if add_mode == 'replace': if target:
target.clear_widgets() if add_mode == 'replace':
target.add_widget(w) target.clear_widgets()
target.add_widget(w)
def doerr(o,e): def doerr(o,e):
Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error' Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error'