Merge branch 'master' of github.com:jeena/Bungloo

This commit is contained in:
Jeena Paradies 2013-04-03 11:56:46 +02:00
commit e4e7023ecf

View file

@ -87,12 +87,12 @@ class WebViewCreator(QtWebKit.QWebView):
if self.is_local:
frame.evaluateJavaScript("var OS_TYPE = 'linux';")
js_plugin_path = os.path.expanduser('~/.bungloo/Plugin.js')
js_plugin_path = os.path.expanduser('~/.config/bungloo/Plugin.js')
if os.access(js_plugin_path, os.R_OK):
func = "setTimeout(function() { loadJsPlugin('file://localhost/" + js_plugin_path + "') }, 1000);"
frame.evaluateJavaScript(func)
css_plugin_path = os.path.expanduser('~/.bungloo/Plugin.css')
css_plugin_path = os.path.expanduser('~/.config/bungloo/Plugin.css')
if os.access(css_plugin_path, os.R_OK):
func = "setTimeout(function() { loadCssPlugin('file://localhost/" + css_plugin_path + "') }, 1000);"
frame.evaluateJavaScript(func)