Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ajax modals

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-18 08:20:21 +05:30
parent 58c7d4a5b7
commit 50f058ed86
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pyj/modals.pyj
View File

@ -83,7 +83,7 @@ class ModalContainer:
def hide_modal(self, modal_id): def hide_modal(self, modal_id):
if self.current_modal is not None and self.current_modal.id == modal_id: if self.current_modal is not None and self.current_modal.id == modal_id:
self.close_current_modal() self.clear_current_modal()
else: else:
doomed_modal = None doomed_modal = None
for i, modal in enumerate(self.modals): for i, modal in enumerate(self.modals):
@ -106,17 +106,20 @@ class ModalContainer:
set_css(c, display='block') set_css(c, display='block')
c.firstChild.lastChild.style.visibility = 'visible' if self.current_modal.show_close else 'hidden' c.firstChild.lastChild.style.visibility = 'visible' if self.current_modal.show_close else 'hidden'
def clear_current_modal(self):
self.current_modal = None
c = self.modal_container
clear(c.firstChild.firstChild)
if self.modals.length == 0:
set_css(c, display='none')
else:
self.update()
def close_current_modal(self, event): def close_current_modal(self, event):
if self.current_modal is not None: if self.current_modal is not None:
if self.current_modal.on_close is not None and self.current_modal.on_close(event) is True: if self.current_modal.on_close is not None and self.current_modal.on_close(event) is True:
return return
self.current_modal = None self.clear_current_modal()
c = self.modal_container
clear(c.firstChild.firstChild)
if self.modals.length == 0:
set_css(c, display='none')
else:
self.update()
def create_simple_dialog(title, msg, details, icon_name, prefix): def create_simple_dialog(title, msg, details, icon_name, prefix):
details = details or '' details = details or ''
@ -222,7 +225,8 @@ def ajax_progress_dialog(path, on_complete, msg, **kw):
def on_progress_callback(loaded, total, xhr): def on_progress_callback(loaded, total, xhr):
pd.update_progress(loaded, total) pd.update_progress(loaded, total)
xhr = ajax(path, on_complete_callback, on_progress=on_progress_callback, **kw) xhr = ajax(path, on_complete_callback, on_progress=on_progress_callback, **kw)
pd = progress_dialog(msg, xhr.abort) pd = progress_dialog(msg, xhr.abort.bind(xhr))
xhr.send()
return xhr, pd return xhr, pd
def ajax_send_progress_dialog(path, data, on_complete, msg, **kw): def ajax_send_progress_dialog(path, data, on_complete, msg, **kw):
@ -235,5 +239,5 @@ def ajax_send_progress_dialog(path, data, on_complete, msg, **kw):
def on_progress_callback(loaded, total, xhr): def on_progress_callback(loaded, total, xhr):
pd.update_progress(loaded, total) pd.update_progress(loaded, total)
xhr = ajax_send(path, data, on_complete_callback, on_progress=on_progress_callback, **kw) xhr = ajax_send(path, data, on_complete_callback, on_progress=on_progress_callback, **kw)
pd = progress_dialog(msg, xhr.abort) pd = progress_dialog(msg, xhr.abort.bind(xhr))
return xhr, pd return xhr, pd