Move add_extra_css into the dom module

src/pyj/book_list/book_details.pyj

@@ -6,12 +6,12 @@ import traceback
 from ajax import ajax
 from book_list.globals import get_current_query
 from book_list.theme import get_font_size
-from dom import clear, build_rule, svgicon
+from dom import clear, build_rule, svgicon, add_extra_css
 from elementmaker import E
 from gettext import gettext as _
 from book_list.globals import get_boss
 from modals import error_dialog
-from widgets import create_spinner, create_button, add_extra_css
+from widgets import create_spinner, create_button
 from date import format_date
 from utils import fmt_sidx
 

src/pyj/book_list/boss.pyj

@@ -4,11 +4,10 @@ from __python__ import hash_literals
 
 import traceback
 from ajax import encode_query
-from dom import set_css
+from dom import set_css, get_widget_css
 from elementmaker import E
 from modals import error_dialog, create_modal_container
 from gettext import gettext as _
-from widgets import get_widget_css
 from utils import parse_url_params, debounce
 
 from book_list.globals import get_session_data, set_boss, set_current_query

src/pyj/book_list/item_list.pyj

@@ -2,9 +2,8 @@
 # License: GPL v3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-from dom import build_rule, svgicon
+from dom import build_rule, svgicon, add_extra_css
 from elementmaker import E
-from widgets import add_extra_css
 
 from book_list.theme import get_font_size, get_color
 

src/pyj/book_list/search.pyj

@@ -3,10 +3,10 @@
 from __python__ import hash_literals
 
 from ajax import ajax
-from dom import clear, set_css, build_rule, svgicon
+from dom import clear, set_css, build_rule, svgicon, add_extra_css
 from elementmaker import E
 from gettext import gettext as _
-from widgets import create_button, create_spinner, Breadcrumbs, add_extra_css
+from widgets import create_button, create_spinner, Breadcrumbs
 from modals import show_modal
 from book_list.globals import get_boss, get_session_data
 from book_list.theme import get_color, get_font_size

src/pyj/book_list/top_bar.pyj

@@ -3,10 +3,9 @@
 from __python__ import hash_literals
 
 from book_list.theme import get_color, get_font_size
-from dom import set_css, clear, create_keyframes, build_rule, svgicon
+from dom import set_css, clear, create_keyframes, build_rule, svgicon, add_extra_css
 from elementmaker import E
 from gettext import gettext as _
-from widgets import add_extra_css
 
 bar_counter = 0
 CLASS_NAME = 'main-top-bar'

src/pyj/book_list/views.pyj

@@ -4,11 +4,10 @@ from __python__ import hash_literals
 
 import traceback
 from ajax import ajax_send
-from dom import set_css, clear, build_rule
+from dom import set_css, clear, build_rule, add_extra_css
 from elementmaker import E
 from gettext import gettext as _
 from modals import error_dialog, ajax_progress_dialog
-from widgets import add_extra_css
 
 from book_list.globals import get_session_data, get_boss
 from widgets import create_button, create_spinner

src/pyj/dom.pyj

@@ -102,3 +102,12 @@ def ensure_id(w):
         ans = 'auto-id-' + auto_id_count
         w.setAttribute('id', ans)
     return ans
+
+extra_css = []
+
+def add_extra_css(func):
+    extra_css.push(func)
+
+def get_widget_css():
+    return extra_css.join('\n')
+

src/pyj/modals.pyj

@@ -4,11 +4,10 @@ from __python__ import hash_literals
 
 from ajax import ajax, ajax_send
 from elementmaker import E
-from dom import set_css, clear, build_rule, svgicon
+from dom import set_css, clear, build_rule, svgicon, add_extra_css
 from gettext import gettext as _
 from book_list.theme import get_color, get_font_size
 from popups import MODAL_Z_INDEX
-from widgets import add_extra_css
 
 modal_container = None
 modal_count = 0

src/pyj/read_book/overlay.pyj

@@ -2,11 +2,11 @@
 # License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals, bound_methods
 
-from dom import clear, set_css, element, svgicon, build_rule
+from dom import clear, set_css, element, svgicon, build_rule, add_extra_css
 from elementmaker import E
 from book_list.theme import get_color
 from book_list.globals import get_boss
-from widgets import create_spinner, create_button, add_extra_css
+from widgets import create_spinner, create_button
 from gettext import gettext as _
 from read_book.toc import create_toc_panel
 

src/pyj/widgets.pyj

@@ -2,7 +2,7 @@
 # License: GPL v3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-from dom import build_rule, clear, svgicon, create_keyframes, set_css, change_icon_image
+from dom import build_rule, clear, svgicon, create_keyframes, set_css, change_icon_image, add_extra_css
 from elementmaker import E
 
 from book_list.theme import get_color
@@ -202,17 +202,11 @@ def scroll_tree_item_into_view(item):
 
 # }}}
 
-extra_css = []
-
-def add_extra_css(func):
-    extra_css.push(func)
-
-def get_widget_css():
+add_extra_css(def():
     ans = 'a, button:focus { outline: none }; a, button::-moz-focus-inner { border: 0 }\n'
     ans += '.simple-link { cursor: pointer } .simple-link:hover { color: red } .simple-link:active { transform: scale(1.5) }\n'
     ans += create_button.style
     ans += create_spinner.style
     ans += Breadcrumbs.STYLE_RULES
-    for func in extra_css:
-        ans += '\n' + func()
     return ans
+)