web/component.py
changeset 6333 e3994fcc21c3
parent 6279 42079f752a9c
parent 6280 e220f8b85f88
child 6423 c560f8d9faee
equal deleted inserted replaced
6293:df44d7163582 6333:e3994fcc21c3
   108             url = view.page_navigation_url(self, path, params)
   108             url = view.page_navigation_url(self, path, params)
   109         elif path == 'json':
   109         elif path == 'json':
   110             url = self.ajax_page_url(**params)
   110             url = self.ajax_page_url(**params)
   111         else:
   111         else:
   112             url = self._cw.build_url(path, **params)
   112             url = self._cw.build_url(path, **params)
       
   113         # XXX hack to avoid opening a new page containing the evaluation of the
       
   114         # js expression on ajax call
       
   115         if url.startswith('javascript:'):
       
   116             url += '; noop();'
   113         return url
   117         return url
   114 
   118 
   115     def ajax_page_url(self, **params):
   119     def ajax_page_url(self, **params):
   116         divid = params.setdefault('divid', 'pageContent')
   120         divid = params.setdefault('divid', 'pageContent')
   117         params['rql'] = self.cw_rset.printable_rql()
   121         params['rql'] = self.cw_rset.printable_rql()
   118         return "javascript: $(%s).loadxhtml('json', %s, 'get', 'swap')" % (
   122         return "javascript: $(%s).loadxhtml('json', %s, 'get', 'swap')" % (
   119             json_dumps('#'+divid), js.ajaxFuncArgs('view', params))
   123             json_dumps('#'+divid), js.ajaxFuncArgs('view', params))
   120 
   124 
   121     def page_link(self, path, params, start, stop, content):
   125     def page_link(self, path, params, start, stop, content):
   122         url = xml_escape(self.page_url(path, params, start, stop))
   126         url = xml_escape(self.page_url(path, params, start, stop))
   123         # XXX hack to avoid opening a new page containing the evaluation of the
       
   124         # js expression on ajax call
       
   125         if url.startswith('javascript:'):
       
   126             url += '; noop();'
       
   127         if start == self.starting_from:
   127         if start == self.starting_from:
   128             return self.selected_page_link_templ % (url, content, content)
   128             return self.selected_page_link_templ % (url, content, content)
   129         return self.page_link_templ % (url, content, content)
   129         return self.page_link_templ % (url, content, content)
   130 
   130 
   131     def previous_link(self, path, params, content='<<', title=_('previous_results')):
   131     def previous_link(self, path, params, content='<<', title=_('previous_results')):