# HG changeset patch # User Goffi # Date 1448974501 -3600 # Node ID f3cd261ea12f10303c1b963749a85b97d3e89954 # Parent d24e56a5f2efec94667e66f02ade082704282163 browser side: workaround for a pyjamas bug which freeze the browser in some case with addURLToText regex diff -r d24e56a5f2ef -r f3cd261ea12f src/browser/libervia_main.py --- a/src/browser/libervia_main.py Tue Dec 01 12:34:26 2015 +0100 +++ b/src/browser/libervia_main.py Tue Dec 01 13:55:01 2015 +0100 @@ -32,7 +32,7 @@ from sat_frontends.quick_frontend import quick_menus from sat_frontends.tools.misc import InputHistory -from sat_frontends.tools import strings +from sat_browser import strings from sat_frontends.tools import jid from sat_frontends.tools import host_listener from sat.core.i18n import _ diff -r d24e56a5f2ef -r f3cd261ea12f src/browser/sat_browser/chat.py --- a/src/browser/sat_browser/chat.py Tue Dec 01 12:34:26 2015 +0100 +++ b/src/browser/sat_browser/chat.py Tue Dec 01 13:55:01 2015 +0100 @@ -21,7 +21,7 @@ log = getLogger(__name__) # from sat_frontends.tools.games import SYMBOLS -from sat_frontends.tools import strings +from sat_browser import strings from sat_frontends.tools import jid from sat_frontends.quick_frontend import quick_widgets, quick_games, quick_menus from sat_frontends.quick_frontend.quick_chat import QuickChat diff -r d24e56a5f2ef -r f3cd261ea12f src/browser/sat_browser/editor_widget.py --- a/src/browser/sat_browser/editor_widget.py Tue Dec 01 12:34:26 2015 +0100 +++ b/src/browser/sat_browser/editor_widget.py Tue Dec 01 13:55:01 2015 +0100 @@ -19,7 +19,7 @@ from sat.core.log import getLogger log = getLogger(__name__) -from sat_frontends.tools import strings +from sat_browser import strings from pyjamas.ui.HTML import HTML from pyjamas.ui.SimplePanel import SimplePanel diff -r d24e56a5f2ef -r f3cd261ea12f src/browser/sat_browser/strings.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/browser/sat_browser/strings.py Tue Dec 01 13:55:01 2015 +0100 @@ -0,0 +1,66 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# SAT helpers methods for plugins +# Copyright (C) 2013, 2014, 2015 Adrien Cossa (souliane@mailoo.org) + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import re +from __pyjamas__ import JS + + +def getURLParams(url): + """This comes from pyjamas.Location.makeUrlDict with a small change + to also parse full URLs, and parameters with no value specified + (in that case the default value "" is used). + @param url: any URL with or without parameters + @return: a dictionary of the parameters, if any was given, or {} + """ + dict_ = {} + if "/" in url: + # keep the part after the last "/" + url = url[url.rindex("/") + 1:] + if url.startswith("?"): + # remove the first "?" + url = url[1:] + pairs = url.split("&") + for pair in pairs: + if len(pair) < 3: + continue + kv = pair.split("=", 1) + dict_[kv[0]] = kv[1] if len(kv) > 1 else "" + return dict_ + + +def addURLToText(text): + """Workaround for a pyjamas bug with regex + + In some case, Pyjamas' re module get crazy and freeze browsers (tested with Iceweasel and Chromium). + we use javascript as a workaround + This method is inspired from https://stackoverflow.com/questions/1500260/detect-urls-in-text-with-javascript + """ + JS("""var urlRegex = /(https?:\/\/[^\s]+)/g; + return text.replace(urlRegex, function(url) { + return '' + url + ''; + })""") + + +def addURLToImage(string): + """Check a XHTML text for what looks like an imageURL and make it clickable""" + def repl(match): + url = match.group(1) + return '%s' % (url, match.group(0)) + pattern = r"""]* src="([^"]+)"[^>]*>""" + return re.sub(pattern, repl, string) diff -r d24e56a5f2ef -r f3cd261ea12f src/browser/sat_browser/xmlui.py --- a/src/browser/sat_browser/xmlui.py Tue Dec 01 12:34:26 2015 +0100 +++ b/src/browser/sat_browser/xmlui.py Tue Dec 01 13:55:01 2015 +0100 @@ -20,7 +20,7 @@ from sat.core.log import getLogger log = getLogger(__name__) from sat_frontends.tools import xmlui -from sat_frontends.tools import strings +from sat_browser import strings from sat_frontends.tools import jid from sat_browser.constants import Const as C from sat_browser import dialog