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

[gen] ckeditor now works with IE.

Browse source
This commit is contained in:
Gaetan Delannay 2012-09-10 11:44:22 +02:00
parent c2eaab4b44
commit 6801188496
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gen/__init__.py
View file

@ -968,16 +968,17 @@ class Type:
try: try:
return method(obj, self) return method(obj, self)
except Exception, e: except Exception, e:
obj.log(tb, type='error')
if raiseOnError: if raiseOnError:
# Raise the initial error. # Raise the initial error.
raise te raise te
else: else:
obj.log(tb, type='error')
return str(te) return str(te)
except Exception, e: except Exception, e:
if raiseOnError: raise e
else:
obj.log(Traceback.get(), type='error') obj.log(Traceback.get(), type='error')
if raiseOnError:
raise e
else:
return str(e) return str(e)
def process(self, obj): def process(self, obj):
@ -1210,6 +1211,9 @@ class String(Type):
# Default width, height and maxChars vary according to String format # Default width, height and maxChars vary according to String format
if width == None: if width == None:
if format == String.TEXT: self.width = 60 if format == String.TEXT: self.width = 60
# This width corresponds to the standard width of an Appy page,
# minus the portlet.
if format == String.XHTML: self.width = 750
else: self.width = 30 else: self.width = 30
if height == None: if height == None:
if format == String.TEXT: self.height = 5 if format == String.TEXT: self.height = 5

11
gen/mixins/__init__.py
View file

@ -1576,13 +1576,16 @@ class BaseMixin:
# this field. # this field.
field = self.getAppyType(name) field = self.getAppyType(name)
ckAttrs = {'toolbar': field.richText and 'AppyRich' or 'Appy', ckAttrs = {'toolbar': field.richText and 'AppyRich' or 'Appy',
'format_tags': '%s' % ';'.join(field.styles)} 'format_tags': '%s' % ';'.join(field.styles),
'width': field.width}
if field.allowImageUpload: if field.allowImageUpload:
ckAttrs['filebrowserUploadUrl'] = '%s/upload' % self.absolute_url() ckAttrs['filebrowserUploadUrl'] = '%s/upload' % self.absolute_url()
ck = '' ck = []
for k, v in ckAttrs.iteritems(): for k, v in ckAttrs.iteritems():
ck += "%s: '%s'," % (k, v) if isinstance(v, int): sv = str(v)
res = "CKEDITOR.replace('%s', {%s})" % (name, ck) else: sv = '"%s"' % v
ck.append('%s: %s' % (k, sv))
res = 'CKEDITOR.replace("%s", {%s})' % (name, ', '.join(ck))
return res return res
def getCalendarInit(self, name, years): def getCalendarInit(self, name, years):

2
gen/ui/widgets/string.pt
View file

@ -64,7 +64,7 @@
class python: (fmt==2) and ('rich_%s' % name) or ''" class python: (fmt==2) and ('rich_%s' % name) or ''"
tal:content="python: test(inRequest, requestValue, value)"> tal:content="python: test(inRequest, requestValue, value)">
</textarea> </textarea>
<script tal:condition="python: fmt == 2" <script type="text/javascript" tal:condition="python: fmt == 2"
tal:content="python: contextObj.getEditorInit(name)"> tal:content="python: contextObj.getEditorInit(name)">
</script> </script>
</tal:textarea> </tal:textarea>