Skip to content

Commit

Permalink
Remove div overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
@furstenheim-geoblink
furstenheim-geoblink committed Jan 17, 2018
1 parent 8ae3d3b commit facc635
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 346 deletions.
7 changes: 5 additions & 2 deletions extension/scripts/Controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1186,6 +1186,9 @@ var window = this.window
}, {$, document, window})

deferredSelector.done(function (result) {
if (result === null) {
console.error('Result was returned null. Maybe there was a communication loss with content script. Try to close and open the dev tools')
}
$(input).val(result.CSSSelector)

// update validation for selector field
Expand Down Expand Up @@ -1332,8 +1335,8 @@ var window = this.window
},
previewClickElementSelector: function (button) {
var $ = this.$
var document = this.document
var window = this.window
var document = this.document
var window = this.window
if (!$(button).hasClass('preview')) {
var sitemap = this.state.currentSitemap
var selector = this.getCurrentlyEditedSelector()
Expand Down
2 changes: 1 addition & 1 deletion extension/scripts/Selector/SelectorGoogMapID.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var SelectorGoogMapID = {

getItemCSSSelector: function () {
// We get the container
return '*'
return '*:not(div.overlay)'
},

getMapsSelectorFromDivHTML: function (html, options = {}) {
Expand Down
343 changes: 0 additions & 343 deletions tests/spec/Selector/SelectorGoogMapIDSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,347 +43,4 @@ describe('Goog Map ID Selector', function () {
done()
})
})

it('should return multiple elements', function (done) {
$el.innerHTML = '<div>a</div><div>b</div>'
var selector = new Selector({
id: 'a',
type: 'SelectorElementClick',
multiple: true,
selector: 'div',
clickType: 'clickOnce'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
done()
})
})

it('should get elements that are available immediately after clicking', function (done) {
$el.innerHTML = '<a>a</a>'
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
utils.appendHTML($el, '<div>test</div>', document)
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
clickType: 'clickOnce'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 1)
assert.equal(data[0].textContent, 'test')
done()
})
})

it('should skip clicking if click element is removed from dom', function (done) {
$el.innerHTML = "<a>a</a><a class='remove'>b</a>"
$el.querySelector('a').addEventListener('click', function () {
console.log($el.innerHTML)
utils.appendHTML($el, '<div>test</div>', document)
console.log($el.innerHTML)
var elementToRemove = $el.querySelector('.remove')
if (elementToRemove) elementToRemove.remove()
})

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickOnce'
}, {$, document, window})
var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 1)
assert.equal(data[0].textContent, 'test')
console.log('done')
done()
})
})

it('should get elements that are not available immediately after clicking but after some time', function (done) {
$el.innerHTML = '<a>a</a>'
$el.querySelector('a').addEventListener('click', function () {
setTimeout(function () {
utils.appendHTML($el, '<div>test</div>', document)
}, 50)
})

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickOnce'
}, {$, document, window})
var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 1)
assert.equal(data[0].textContent, 'test')
done()
})
})

it('should return no data columns', function () {
var selector = new Selector({
id: 'a',
type: 'SelectorElement',
multiple: true,
selector: 'div'
}, {$, document, window})

var columns = selector.getDataColumns()
assert.deepEqual(columns, [])
})

it('should return multiple elements if only contents is changed', function (done) {
$el.innerHTML = '<a>a</a><div>a</div>'
$el.querySelector('a').addEventListener('click', function () {
setTimeout(function () {
$el.querySelector('div').textContent = 'b'
}, 50)
})

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickOnce'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 2)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
done()
})
})

it('should click buttons that are not yet added', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
setTimeout(function () {
$el.querySelectorAll('div').forEach(function (el) { el.textContent = 'b' })
$el.querySelectorAll('a').forEach(el => el.remove())
utils.appendHTML($el, '<a>2</a>', document)
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
setTimeout(function () {
$el.querySelectorAll('div').forEach(function (el) { el.textContent = 'c' })
}, 50)
}))
}, 50)
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickOnce'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 3)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
assert.equal(data[2].textContent, 'c')
done()
})
})

it('should discard initial elements for ClickOnce selector type', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
setTimeout(function () {
$el.querySelectorAll('div').forEach(el => el.textContent = 'b')
$el.querySelectorAll('a').forEach(el => el.remove())
utils.appendHTML($el, '<a>2</a>', document)
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
setTimeout(function () {
$el.querySelectorAll('div').forEach(el => el.textContent = 'c')
}, 50)
}))
}, 50)
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickOnce',
discardInitialElements: true
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 2)
assert.equal(data[0].textContent, 'b')
assert.equal(data[1].textContent, 'c')
done()
})
})

it('should extract elements with clickMore type', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
var moreElements = ['b', 'c']
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
var next = moreElements.shift()
if (next) {
setTimeout(function () {
utils.appendHTML($el, '<div>' + next + '</div>', document)
}, 50)
}
// remove if there won't be new elements
if (moreElements.length === 0) {
$el.querySelectorAll('a').forEach(el => el.remove())
}
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 200,
clickType: 'clickMore'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 3)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
assert.equal(data[2].textContent, 'c')
done()
})
})

it('should click buttons that are added', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
var moreElements = ['b', 'c']
var clickHandler = function () {
setTimeout(function () {
var next = moreElements.shift()
if (next) {
utils.appendHTML($el, '<div>' + next + '</div>', document)
$el.querySelectorAll('a').forEach(el => el.remove())
utils.appendHTML($el, '<a>1</a>', document)
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', clickHandler))
}
}, 50)
}

$el.querySelectorAll('a').forEach(el => el.addEventListener('click', clickHandler))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickMore'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 3)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
assert.equal(data[2].textContent, 'c')
done()
})
})

// :contains is not a valid native selector
it.skip('should discard initial elements for ClickMore selector type', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
var moreElements = ['b', 'c']
$el.querySelectorAll('a').forEach(el => el.addEventListener('click', function () {
setTimeout(function () {
$el.querySelectorAll("div:contains('a')").forEach(el => el.remove())
var next = moreElements.shift()
if (next) {
utils.appendHTML($el, '<div>' + next + '</div>', document)
}
}, 50)
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickMore',
discardInitialElements: true
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 2)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
done()
})
})

it('should scrape elements with clickMore type when previous elements are removed after click', function (done) {
$el.innerHTML = '<a>1</a><div>a</div>'
var moreElements = ['b', 'c']
$el.querySelectorAll('a').forEach(e => e.addEventListener('click', function () {
setTimeout(function () {
var next = moreElements.shift()

if (next) {
$el.querySelectorAll('div').forEach(el => el.textContent = next)
}
}, 50)
}))

var selector = new Selector({
id: 'div',
type: 'SelectorElementClick',
multiple: true,
clickElementSelector: 'a',
selector: 'div',
delay: 100,
clickType: 'clickMore'
}, {$, document, window})

var dataDeferred = selector.getData($el)
dataDeferred.then(function (data) {
assert.equal(data.length, 3)
assert.equal(data[0].textContent, 'a')
assert.equal(data[1].textContent, 'b')
assert.equal(data[2].textContent, 'c')
done()
})
})
})

0 comments on commit facc635

Please sign in to comment.