utils.py
changeset 10166 0095961df66c
parent 10118 78ab2b14048a
child 10235 684215aca046
equal deleted inserted replaced
10165:7f1f7f710b16 10166:0095961df66c
   366         resources declaration
   366         resources declaration
   367         """
   367         """
   368         w = self.write
   368         w = self.write
   369         # 1/ variable declaration if any
   369         # 1/ variable declaration if any
   370         if self.jsvars:
   370         if self.jsvars:
   371             w(self.script_opening)
   371             if skiphead:
       
   372                 w(u'<cubicweb:script>')
       
   373             else:
       
   374                 w(self.script_opening)
   372             for var, value, override in self.jsvars:
   375             for var, value, override in self.jsvars:
   373                 vardecl = u'%s = %s;' % (var, json.dumps(value))
   376                 vardecl = u'%s = %s;' % (var, json.dumps(value))
   374                 if not override:
   377                 if not override:
   375                     vardecl = (u'if (typeof %s == "undefined") {%s}' %
   378                     vardecl = (u'if (typeof %s == "undefined") {%s}' %
   376                                (var, vardecl))
   379                                (var, vardecl))
   377                 w(vardecl + u'\n')
   380                 w(vardecl + u'\n')
   378             w(self.script_closing)
   381             if skiphead:
       
   382                 w(u'</cubicweb:script>')
       
   383             else:
       
   384                 w(self.script_closing)
   379         # 2/ css files
   385         # 2/ css files
   380         ie_cssfiles = ((x, (y, z)) for x, y, z in self.ie_cssfiles)
   386         ie_cssfiles = ((x, (y, z)) for x, y, z in self.ie_cssfiles)
   381         if self.datadir_url and self._cw.vreg.config['concat-resources']:
   387         if self.datadir_url and self._cw.vreg.config['concat-resources']:
   382             cssfiles = self.group_urls(self.cssfiles)
   388             cssfiles = self.group_urls(self.cssfiles)
   383             ie_cssfiles = self.group_urls(ie_cssfiles)
   389             ie_cssfiles = self.group_urls(ie_cssfiles)