merge
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Wed, 28 Jan 2009 15:52:45 +0100
changeset 499 ad3de58a8e30
parent 498 fc7ce5f95dd9 (current diff)
parent 496 e25a3c2f5393 (diff)
child 500 14befdd50126
merge
--- a/web/facet.py	Wed Jan 28 15:50:14 2009 +0100
+++ b/web/facet.py	Wed Jan 28 15:52:45 2009 +0100
@@ -243,7 +243,7 @@
                            help=_('display the box or not')),
         _('order'):   dict(type='Int', default=99,
                            help=_('display order of the box')),
-        _('context'): dict(type='String', default=None,
+        _('context'): dict(type='String', default='',
                            # None <-> both
                            vocabulary=(_('tablefilter'), _('facetbox'), ''),
                            help=_('context where this box should be displayed')),
--- a/web/request.py	Wed Jan 28 15:50:14 2009 +0100
+++ b/web/request.py	Wed Jan 28 15:52:45 2009 +0100
@@ -640,7 +640,11 @@
     
     def xhtml_browser(self):
         useragent = self.useragent()
-        if useragent and ('MSIE' in useragent or 'KHTML' in useragent):
+        # MSIE does not support xml content-type
+        # quick fix: Opera supports xhtml and handles namespaces
+        # properly but it breaks jQuery.attr()
+        if useragent and ('MSIE' in useragent or 'KHTML' in useragent
+                          or 'Opera' in useragent):
             return False
         return True