Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341447 )

Change subject: collector/modulecss: Fix "Cannot read property of null" error
......................................................................

collector/modulecss: Fix "Cannot read property of null" error

Steps to reproduce:
1. Run from console:
  `mw.loader.load('http://example.org/main.css', 'text/css')`
2. Open Performance inspector.

cssFromURL() will crash because it encounters an external
stylesheet which has 'href' but not 'cssRules' (due to same-origin
policy).

On Wikimedia wikis, external stylesheets mostly don't exist (due
to the WMF Privacy policy). But MediaWiki in general does support it.
And even on WMF wikis, Gadgets and user scripts may load external
content after opt-in.

Change-Id: I1f55be4514b99a7f228dec92490e93d8db21d6f2
---
M modules/collectors/ext.PerformanceInspector.modulescss.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PerformanceInspector 
refs/changes/47/341447/1

diff --git a/modules/collectors/ext.PerformanceInspector.modulescss.js 
b/modules/collectors/ext.PerformanceInspector.modulescss.js
index 253578b..13d667d 100644
--- a/modules/collectors/ext.PerformanceInspector.modulescss.js
+++ b/modules/collectors/ext.PerformanceInspector.modulescss.js
@@ -63,7 +63,7 @@
                                // we have styles from a link rel="stylesheet" 
href
                                // it would be cool if we could separated 
inline CSS
                                // from resource loaded CSS?
-                               if ( style.href ) {
+                               if ( style.href && style.cssRules ) {
                                        $.each( style.cssRules, function ( 
index, rule ) {
                                                allStyles += rule.cssText;
                                        } );

-- 
To view, visit https://gerrit.wikimedia.org/r/341447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f55be4514b99a7f228dec92490e93d8db21d6f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PerformanceInspector
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to