mirror of
https://github.com/encounter/phantomjs.git
synced 2026-03-30 11:35:11 -07:00
Simplify CSConverter()'s convert() return statement
Simplify Phantom()'s loadImages and loadPlugins
This commit is contained in:
@@ -41,6 +41,4 @@ class CSConverter(QObject):
|
||||
def convert(self, script):
|
||||
self.setProperty('source', script)
|
||||
result = self.m_webPage.mainFrame().evaluateJavaScript('this.CoffeeScript.compile(converter.source)')
|
||||
if result:
|
||||
return result
|
||||
return ''
|
||||
return result if result else ''
|
||||
|
||||
+2
-4
@@ -43,8 +43,6 @@ class Phantom(QObject):
|
||||
self.m_script = args.script
|
||||
self.m_scriptFile = args.script_name
|
||||
self.m_args = args.script_args
|
||||
autoLoadImages = False if args.load_images == 'no' else True
|
||||
pluginsEnabled = True if args.load_plugins == 'yes' else False
|
||||
|
||||
do_action('PhantomInitPre', Bunch(locals()))
|
||||
|
||||
@@ -60,8 +58,8 @@ class Phantom(QObject):
|
||||
|
||||
self.m_page.javaScriptConsoleMessageSent.connect(self.printConsoleMessage)
|
||||
|
||||
self.m_defaultPageSettings['loadImages'] = autoLoadImages
|
||||
self.m_defaultPageSettings['loadPlugins'] = pluginsEnabled
|
||||
self.m_defaultPageSettings['loadImages'] = False if args.load_images == 'no' else True
|
||||
self.m_defaultPageSettings['loadPlugins'] = True if args.load_plugins == 'yes' else False
|
||||
self.m_defaultPageSettings['userAgent'] = self.m_page.userAgent()
|
||||
self.m_page.applySettings(self.m_defaultPageSettings)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user