Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-13 16:55:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'simpledo' into qa

Browse source
This commit is contained in:
Barbara Miller 2017-02-05 22:01:07 -08:00
commit 46ee409de8
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
brozzler/js-templates/simpledo.js.j2
View file

@ -33,9 +33,15 @@ var umbraBehavior = {
var didSomething = false; var didSomething = false;
var somethingLeftBelow = false; var somethingLeftBelow = false;
var somethingLeftAbove = false; var somethingLeftAbove = false;
<<<<<<< HEAD
var cssSelector = {{sdo_css_selector}}; var cssSelector = {{sdo_css_selector}};
var doAction = {{sdo_action}}; // currently supports click, mouseover var doAction = {{sdo_action}}; // currently supports click, mouseover
var doUntilTimeout = {{sdo_until_hard_timeout}}; var doUntilTimeout = {{sdo_until_hard_timeout}};
=======
var cssSelector = {{sdo_css_selector|json}};
var doAction = {{sdo_action|json}}; // currently supports click, mouseover
var doUntilTimeout = {{sdo_until_hard_timeout|json}};
>>>>>>> simpledo
var iframes = document.querySelectorAll("iframe"); var iframes = document.querySelectorAll("iframe");
var documents = Array(iframes.length + 1); var documents = Array(iframes.length + 1);