backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

Pass sheet to deferredSheetExtraction rather than rules in order to ensure that the CSS rule extraction from style tags is guarded with null check on the property containing the css rules (edge case). (#378)

Browse Source
This commit is contained in:
John Berlin 2018-09-06 19:30:43 -04:00 committed by Ilya Kreymer
parent d3e66b581a
commit 348e434bee
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pywb/static/wombat.js
View File

@ -1352,9 +1352,10 @@ var _WBWombat = function($wbwindow, wbinfo) {
}
}
PWorker.prototype.deferredSheetExtraction = function(rules) {
PWorker.prototype.deferredSheetExtraction = function(sheet) {
var rules = sheet.cssRules || sheet.rules;
// if no rules this a no op
if (rules.length === 0) return;
if (!rules || rules.length === 0) return;
function extract() {
// loop through each rule of the stylesheet
var media = [];
@ -1450,7 +1451,7 @@ var _WBWombat = function($wbwindow, wbinfo) {
// check no op condition
if (this.sheet == null) return;
// defer extraction to be nice :)
WBPreserWorker.deferredSheetExtraction(this.sheet.cssRules);
WBPreserWorker.deferredSheetExtraction(this.sheet);
};
}
@ -1758,7 +1759,7 @@ var _WBWombat = function($wbwindow, wbinfo) {
if (wbUsePresWorker && elem.sheet != null) {
// we have a stylesheet so lets be nice to UI thread
// and defer extraction
WBPreserWorker.deferredSheetExtraction(elem.sheet.cssRules);
WBPreserWorker.deferredSheetExtraction(elem.sheet);
}
}
break;
@ -2195,7 +2196,7 @@ var _WBWombat = function($wbwindow, wbinfo) {
orig_setter.call(this, res);
if (wbUsePresWorker && this.tagName === 'STYLE' && this.sheet != null) {
// got preserve all the things
WBPreserWorker.deferredSheetExtraction(this.sheet.rules);
WBPreserWorker.deferredSheetExtraction(this.sheet);
}
};