rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Appy is now integrated to ckeditor 4.4.7 via CDN (check http://cdn.ckeditor.com).

Browse source
This commit is contained in:
Gaetan Delannay 2015-02-22 12:42:04 +01:00
parent 302556192b
commit af635f936f
236 changed files with 72 additions and 3311 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gen/mixins/__init__.py
View file

@ -784,28 +784,28 @@ class BaseMixin:
'''Returns the fields sorted by group. If a dict is given in p_cssJs,
we will add it in the css and js files required by the fields.'''
res = []
groups = {} # The already encountered groups.
groups = {} # The already encountered groups
# If a dict is given in p_cssJs, we must fill it with the CSS and JS
# files required for every returned field.
collectCssJs = isinstance(cssJs, dict)
css = js = None
config = self.getProductConfig(True)
# If param "refresh" is there, we must reload the Python class
refresh = ('refresh' in self.REQUEST)
if refresh:
klass = self.getClass(reloaded=True)
if refresh: klass = self.getClass(reloaded=True)
for field in self.getAllAppyTypes():
if refresh: field = field.reload(klass, self)
if field.page.name != pageName: continue
if not field.isShowable(self, layoutType): continue
if collectCssJs:
if css == None: css = []
field.getCss(layoutType, css)
field.getCss(layoutType, css, config)
if js == None: js = []
field.getJs(layoutType, js)
field.getJs(layoutType, js, config)
if not field.group:
res.append(field)
else:
# Insert the UiGroup instance corresponding to field.group.
# Insert the UiGroup instance corresponding to field.group
uiGroup = field.group.insertInto(res, groups, field.page,
self.meta_type)
uiGroup.addElement(field)
@ -858,9 +858,10 @@ class BaseMixin:
# inclusion can be important, and this could be losed by using sets.
css = []
js = []
config = self.getProductConfig(True)
for field in fields:
field.getCss(layoutType, css)
field.getJs(layoutType, js)
field.getCss(layoutType, css, config)
field.getJs(layoutType, js, config)
res['css'] = css
res['js'] = js