Merge pull request #6 from AliasIO/master

Update
main
DaAwesomeP 9 years ago
commit a8429c596a

@ -30,19 +30,23 @@ echo "Creating hard links..."
ln -f $path/wappalyzer.js $path/drivers/firefox/lib
ln -f $path/apps.json $path/drivers/firefox/data
ln -f $path/icons/*.png $path/drivers/firefox/data/images/icons
ln -f $path/icons/*.svg $path/drivers/firefox/data/images/icons
ln -f $path/utils/*.js $path/drivers/firefox/data/js
ln -f $path/wappalyzer.js $path/drivers/chrome/js
ln -f $path/apps.json $path/drivers/chrome
ln -f $path/icons/*.png $path/drivers/chrome/images/icons
ln -f $path/icons/*.svg $path/drivers/chrome/images/icons
ln -f $path/utils/*.js $path/drivers/chrome/js
ln -f $path/wappalyzer.js $path/drivers/bookmarklet/js
ln -f $path/icons/*.png $path/drivers/bookmarklet/images/icons
ln -f $path/icons/*.svg $path/drivers/bookmarklet/images/icons
ln -f $path/wappalyzer.js $path/drivers/html/js
ln -f $path/apps.json $path/drivers/html
ln -f $path/icons/*.png $path/drivers/html/images/icons
ln -f $path/icons/*.svg $path/drivers/html/images/icons
ln -f $path/wappalyzer.js $path/drivers/php/js
ln -f $path/apps.json $path/drivers/php

File diff suppressed because it is too large Load Diff

@ -1,3 +1,4 @@
images/icons/*.png
images/icons/*.svg
js/wappalyzer.js
js/apps.js

@ -147,7 +147,7 @@
'<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
'<a target="_blank" class="wappalyzer-application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
'<strong>' +
'<img src="' + w.config.websiteURL + 'bookmarklet/images/icons/' + app + '.png" width="16" height="16"/> ' + app +
'<img src="' + w.config.websiteURL + 'bookmarklet/images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app +
'</strong>' +
'</a>'
;

@ -1,4 +1,5 @@
apps.json
images/icons/*.png
images/icons/*.svg
js/wappalyzer.js
js/iframe.js

@ -193,7 +193,7 @@
for ( appName in w.detected[url] ) {
w.apps[appName].cats.forEach(function(cat) {
if ( cat == match && !found ) {
chrome.pageAction.setIcon({ tabId: tab.id, path: 'images/icons/' + appName + '.png' });
chrome.pageAction.setIcon({ tabId: tab.id, path: 'images/icons/' + w.apps[appName].icon });
found = true;
}

@ -35,7 +35,7 @@ document.addEventListener('DOMContentLoaded', function() {
html =
'<div class="detected-app">' +
'<a target="_blank" href="https://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?pk_campaign=chrome&pk_kwd=popup">' +
'<img src="images/icons/' + appName + '.png"/>' +
'<img src="images/icons/' + response.apps[appName].icon + '"/>' +
'<span class="label"><span class="name">' + appName + '</span>' + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
'</a>';

@ -1,7 +1,7 @@
{ "name": "Wappalyzer",
"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
"description": "Identifies software on the web",
"version": "2.43",
"version": "2.45",
"default_locale": "en",
"manifest_version": 2,
"icons": {

@ -1,4 +1,5 @@
data/apps.json
data/images/icons/*.png
data/images/icons/*.svg
data/js/iframe.js
lib/wappalyzer.js

@ -35,7 +35,7 @@
});
}(appName));
img.setAttribute('src', 'images/icons/' + appName + '.png');
img.setAttribute('src', 'images/icons/' + message.apps[appName].icon);
img.setAttribute('height', '16');
img.setAttribute('width', '16');

@ -249,7 +249,7 @@
};
Button.prototype.setIcon = function(appName) {
var url = typeof appName === 'undefined' ? './images/icon32.png' : './images/icons/' + appName + '.png';
var url = typeof appName === 'undefined' ? './images/icon32.png' : './images/icons/' + w.apps[appName].icon;
this.button.icon = url;
};
@ -303,7 +303,7 @@
UrlBar.prototype.addIcon = function(appName) {
var
icon = this.document.createElement('image'),
url = typeof appName === 'undefined' ? 'images/icon32.png' : 'images/icons/' + appName + '.png',
url = typeof appName === 'undefined' ? 'images/icon32.png' : 'images/icons/' + w.apps[appName].icon,
tooltipText = ( typeof appName !== 'undefined' ? appName + ' - ' + require('sdk/l10n').get('clickForDetails') + ' - ' : '' ) + require('sdk/l10n').get('name');
icon.setAttribute('src', require('sdk/self').data.url(url));

@ -8,7 +8,7 @@
"description": "Identifies software on the web",
"author": "Elbert Alias",
"license": "GPLv3",
"version": "3.2.1",
"version": "3.2.2",
"main": "driver.js",
"preferences": [{
"name": "tracking",

@ -1,3 +1,4 @@
apps.json
images/icons/*.png
images/icons/*.svg
js/wappalyzer.js

@ -51,7 +51,7 @@
document.getElementById('apps').innerHTML = '';
for ( app in w.detected[url] ) {
document.getElementById('apps').innerHTML += '<img src="images/icons/' + app + '.png" width="16" height="16"/> ' + app + '<br/>';
document.getElementById('apps').innerHTML += '<img src="images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app + '<br/>';
};
},

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45.657001 45.549999" width="45.657" height="45.55"><path d="M27.972 34.075l2.1 2.1h-10.4l-.2-10.6 2.8 2.8 18.9-19c-.7-.9-1.5-1.8-2.3-2.7-8.9-8.9-23.3-8.9-32.2 0-5.7 5.7-7.8 13.7-6.1 21l16.4-16.4-2.5-3.1h11.3v11.8l-2.9-2.8-18.6 18.8c.7 1 1.5 2 2.5 2.9 8.9 8.9 23.3 8.9 32.2 0 5.8-5.8 7.8-13.9 6.1-21.4l-17.1 16.6z" fill="#5a5a59"/></svg>

After

Width:  |  Height:  |  Size: 389 B

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="177" height="188" viewBox="0 0 177 188"><title>marionette</title><g transform="translate(13.344)"><path fill="#939598" d="M87.743 82.508l16.89-39.95c.2-.48.76-.707 1.244-.506a.94.94 0 0 1 .51 1.233L91.502 78.487l-3.76 4.02z"/><path fill="#931A2B" d="M102.313 62.177S94.23 72.77 88.525 78.89c-5.71 6.122-14.03 15.774-14.03 15.774v21.58c.06-.004.115-.016.175-.016 1.38 0 2.498 1.105 2.498 2.47 0 1.366-1.12 2.473-2.498 2.473-.06 0-.115-.01-.175-.014v21.772s10.478-7.12 18.068-14.008c8.558-7.768 18.07-19.896 18.07-19.896l-8.32-46.842z"/><path fill="#A7A9AC" d="M68.562 22.69l-.078 8.413-30.533 12.23.54-7.475 30.077-13.17v.002z"/><path fill="#BCBEC0" d="M110.98 35.564l.595 7.472-30.687-11.984-.145-8.41 30.237 12.922zM74.64 20.03l.032 8.593-44.665-17.445.927-9.832L74.64 20.03zM30.934 1.346l-.927 9.832-5.923 3.495 1.024-9.6 5.826-3.727z"/><path fill="#A7A9AC" d="M118.147.98l1 9.826-44.475 17.817-.033-8.594L118.142.98z"/><path fill="#BCBEC0" d="M124.017 4.66l1.1 9.593-5.97-3.447-1-9.825 5.87 3.68z"/><path fill="#808285" d="M44.03 45.052l-6.08-1.718 30.534-12.23-44.4-16.43 5.923-3.496 44.665 17.445 44.476-17.817 5.968 3.447-44.228 16.8 30.687 11.983-6.065 1.768-30.81-11.4L44.03 45.05v.002z"/><path fill="#939598" d="M24.566 69.727c-.032 0-.064 0-.095-.005a.943.943 0 0 1-.85-1.03l5.446-54.31a.942.942 0 0 1 1.04-.843.94.94 0 0 1 .852 1.023l-5.442 54.31a.948.948 0 0 1-.944.85h-.002zm97.87 0a.947.947 0 0 1-.948-.885l-3.29-54.683a.945.945 0 0 1 .892-1 .94.94 0 0 1 1.008.88l3.287 54.68a.943.943 0 0 1-.89 1c-.02.003-.04.003-.06.004zM58.9 80.657l-15.745-37.12a.942.942 0 0 1 .507-1.236.957.957 0 0 1 1.246.51l17.476 41.2-3.484-3.35z"/><path fill="#A81E2C" d="M72.176 118.7c0-1.306 1.024-2.364 2.32-2.455v-21.58s-8.323-9.653-14.03-15.775c-5.706-6.12-13.79-16.713-13.79-16.713l-8.32 46.848s9.51 12.127 18.068 19.894c7.59 6.883 18.07 14.002 18.07 14.002V121.15c-1.293-.09-2.318-1.15-2.318-2.452z"/><path fill="#939598" d="M74.67 120.11a.952.952 0 0 1-.646-.25l-32.77-30.126-.01-2.578 33.42 30.72L107.66 86.79l.133 2.472-32.468 30.588a.945.945 0 0 1-.657.262h.002z"/><path fill="#CE2227" d="M143.21 68.768l-40.896-6.59s3.804 21.657 3.804 57.91c0 36.257-4.993 60.975-4.993 60.975l41.373-4.474s5.23-19.78 5.23-53.92c-.003-34.132-4.52-53.907-4.52-53.907h.003zm-18.904 95.58a2.01 2.01 0 0 1-2.02-2c0-1.102.903-2 2.02-2a2.01 2.01 0 0 1 2.02 2c0 1.104-.902 2-2.02 2zm-81.434-44.26c0-36.254 3.804-57.91 3.804-57.91L5.78 68.768s-4.517 19.774-4.517 53.91c0 34.136 5.23 53.912 5.23 53.912l41.372 4.477c0-.005-4.993-24.72-4.993-60.98zm-18.948 44.13a1.877 1.877 0 0 1-1.885-1.868c0-1.03.84-1.867 1.88-1.867s1.883.836 1.883 1.865a1.876 1.876 0 0 1-1.884 1.866v.003z"/><ellipse fill="#A51724" cx="124.306" cy="80.657" rx="1.869" ry="1.85"/><path fill="#939598" d="M124.308 163.29a.96.96 0 0 1-.223-.028.94.94 0 0 1-.705-1.134c.03-.116 2.827-12.15 2.827-40.017 0-27.92-2.804-41.123-2.83-41.25a.952.952 0 1 1 1.86-.398c.027.13 2.872 13.535 2.872 41.653 0 28.135-2.766 39.962-2.88 40.452a.95.95 0 0 1-.927.73v-.002z"/><ellipse fill="#A51724" cx="23.924" cy="80.657" rx="2.192" ry="2.17"/><path fill="#939598" d="M23.922 163.29a.952.952 0 0 1-.94-.804c-.023-.156-2.388-16.012-2.388-40.866 0-24.855 2.365-40.94 2.388-41.1a.95.95 0 0 1 1.08-.793c.52.075.88.555.803 1.068-.025.16-2.368 16.12-2.368 40.827 0 24.717 2.345 40.435 2.367 40.586.08.51-.28.995-.8 1.072-.048.004-.096.01-.142.01z"/></g></svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 813 B

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="M4.836.49l27.26 4.083L59.164.49 54.68 57.804 32.096 63.51 8.312 57.806z" fill="#e5e7e8" stroke="#ccc"/><path d="M32.096 10.746l21.83-3.916-2.91 46.99-18.92 4.698z" fill="#fff"/><path fill="#ff2600" d="M3.756 22.432h34.027v19.136H3.756z"/><path fill="#ff501a" d="M36.764 22.432h23.48v19.136h-23.48z"/><path d="M7.056 24.472v15.053H9.85v-5.093h3.797l1.778-1.59v-6.606L13.62 24.47H7.056zm2.794 2.915h2.66v4.37H9.85v-4.37zm6.79-2.915v15.053h6.9l1.604-1.55V26.01l-1.698-1.538H16.64zm2.916 2.915h2.914v9.224h-2.914v-9.22zm7.04-2.91h7.04v2.912h-4.37v3.17c1.254.046 2.51-.048 3.763 0v2.883c-1.26.047-2.51-.047-3.767 0v6.082h-2.67v-15.05zM40.273 38.74l-.934-.79V35.4h2.79v1.214h2.43V24.476h2.79V37.95l-1.867 1.578h-4.278l-.933-.79zm9.226 0l-.906-.79v-2.558c.882 0 1.88.01 2.76.01v1.212h2.914V33.46h-4.104l-1.602-1.58v-5.826l1.602-1.578h4.958l1.82 1.578-.004 2.307h-2.67v-.97h-2.91v3.158h3.838l1.746 1.546v5.847l-.893.795-.895.796h-4.72z" fill="#fff"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="M4.836.49l27.26 4.083L59.164.49 54.68 57.804 32.096 63.51 8.312 57.806z" fill="#e5e7e8" stroke="#ccc"/><path d="M32.096 10.746l21.83-3.916-2.91 46.99-18.92 4.698z" fill="#fff"/><path fill="#ff2600" d="M3.756 22.432h34.027v19.136H3.756z"/><path fill="#ff501a" d="M36.764 22.432h23.48v19.136h-23.48z"/><path d="M7.056 24.472v15.053H9.85v-5.093h3.797l1.778-1.59v-6.606L13.62 24.47H7.056zm2.794 2.915h2.66v4.37H9.85v-4.37zm6.79-2.915v15.053h6.9l1.604-1.55V26.01l-1.698-1.538H16.64zm2.916 2.915h2.914v9.224h-2.914v-9.22zm7.04-2.91h7.04v2.912h-4.37v3.17c1.254.04 2.51-.05 3.763 0v2.88c-1.26.042-2.51-.05-3.77 0v6.08h-2.67V24.47zM40.273 38.74l-.934-.79V35.4h2.79v1.214h2.43V24.476h2.79V37.95l-1.87 1.578H41.2l-.933-.79zm9.226 0l-.91-.79v-2.558c.88 0 1.88.01 2.76.01v1.212h2.91V33.46h-4.1l-1.6-1.58v-5.826l1.6-1.578h4.96l1.82 1.578-.003 2.307h-2.67v-.97h-2.91v3.16h3.838l1.746 1.55v5.85l-.89.794-.896.796h-4.72z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 1020 B

After

Width:  |  Height:  |  Size: 996 B

@ -1,39 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg4187"
viewBox="0 0 91.316003 91.374003"
height="91.374001"
width="91.316002">
<defs
id="defs4189" />
<metadata
id="metadata4192">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(0,-960.98816)"
id="layer1">
<path
id="path26"
style="fill:#44b0c3;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 8.4883593,1052.362 c 0,0 -34.9300003,-55.58244 36.9262497,-91.37369 l 0,91.37369 -36.9262497,0" />
<path
id="path28"
style="fill:#44b0c3;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 56.539609,1052.362 0,-56.63495 c 0,0 11.46875,18.71625 34.77625,56.63495 l -34.77625,0" />
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 91.316003 91.374003" height="91.374" width="91.316"><path d="M8.488 91.374S-26.442 35.79 45.415 0v91.374H8.488m48.052 0V34.74s11.468 18.715 34.776 56.634H56.54" fill="#44b0c3"/></svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 236 B

@ -1 +1 @@
<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="16px" height="16px" viewbox="0 0 16 16"><rect x="9" y="9" width="7" height="7" fill="#14B1EF"/><rect x="1" y="9" width="7" height="7" fill="#A7C721"/><rect x="5" y="1" width="7" height="7" fill="#F7A12B"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="16" height="16"><path fill="#14B1EF" d="M9 9h7v7H9z"/><path fill="#A7C721" d="M1 9h7v7H1z"/><path fill="#F7A12B" d="M5 1h7v7H5z"/></svg>

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 216 B

@ -32,7 +32,7 @@ var exports = {};
result = a.protocol + '//' + a.hostname + '/';
if ( a.pathname !== '/' ) {
if ( a.pathname && a.pathname !== '/' ) {
result += this.hashCode(a.pathname);
}
@ -68,7 +68,6 @@ var exports = {};
realArray: function(a) {
return Array.prototype.slice.apply(a);
},
onDocLoaded: function(doc, callback) {
if ( doc.readyState === 'loading' ) {
doc.addEventListener('DOMContentLoaded', callback);
@ -222,12 +221,7 @@ var exports = {};
var isImgWithoutSrc = el.tagName === 'IMG' && !el.src;
var isImgWithoutAnchor = el.tagName === 'IMG' && !(el.parentNode.tagName === 'A' || el.getAttribute('onclick'));
return isAdShaped(el) && !isImgWithoutSrc && !isImgWithoutAnchor;
}
function windowMightContainAds(win) {
return (win.innerWidth >= MIN_WINDOW_PX &&
win.innerHeight >= MIN_WINDOW_PX);
return elementIsAdShaped(el) && !isImgWithoutSrc && !isImgWithoutAnchor;
}
function isNewAd(el, win) {
@ -243,24 +237,17 @@ var exports = {};
return friendlyIframes;
}
function isAdShaped(el, opt_win, opt_retMatched) {
var rect, width, height, result;
function getMatchedAdSize(width, height) {
return SIZE_SET[width + 'x' + height];
}
if ( opt_win ) {
width = opt_win.innerWidth;
height = opt_win.innerHeight;
} else {
rect = el.getBoundingClientRect();
width = rect.width;
height = rect.height;
}
function elementIsAdShaped(el) {
return !!getMatchedAdSizeForElement(el);
}
result = SIZE_SET[width + 'x' + height];
if ( opt_retMatched ) {
return result;
} else {
return !!result;
}
function getMatchedAdSizeForElement(el) {
var rect = el.getBoundingClientRect();
return getMatchedAdSize(rect.width, rect.height);
}
function containsLargeIframes(win) {
@ -277,7 +264,7 @@ var exports = {};
}
function isValidHTML5Div(div, winSize) {
var elSize = isAdShaped(div, null, true);
var elSize = getMatchedAdSizeForElement(div);
if ( typeof div.checks !== 'number' ) {
div.checks = 1;
@ -299,8 +286,8 @@ var exports = {};
if ( !body ) {
return null;
}
winSize = getMatchedAdSize(win.innerWidth, win.innerHeight);
winSize = isAdShaped(null, win, true);
if ( !winSize ) {
return null;
}
@ -309,7 +296,7 @@ var exports = {};
for ( i = 0; i < elements.length; i++ ) {
el = elements[i];
elSize = isAdShaped(el, null, true);
elSize = getMatchedAdSizeForElement(el);
if ( elSize && elSize[0] === winSize[0] && elSize[1] === winSize[1] ) {
return el;
}
@ -324,7 +311,6 @@ var exports = {};
for ( i = 0; i < divs.length; i++ ) {
div = divs[i];
elSize = isAdShaped(div, null, true);
if ( isValidHTML5Div(div, winSize) ) {
return div;
}
@ -347,16 +333,13 @@ var exports = {};
i, div;
for ( i = 0; i < styles.length; i++ ) {
div = styles[i].parentNode;
if ( isAdShaped(div) && jumpedOut(div) ) {
if ( elementIsAdShaped(div) && jumpedOut(div) ) {
return div;
}
}
}
function findAds(win, opt_ads) {
if ( !windowMightContainAds(win) ) {
return;
}
if ( typeof win.searches !== 'number' ) {
win.searches = 0;
@ -365,6 +348,11 @@ var exports = {};
var ads = opt_ads || [];
var adsFound = 0;
if ( win.innerWidth <= MIN_WINDOW_PX || win.innerHeight <= MIN_WINDOW_PX ) {
win.searches++;
return ads;
}
if ( exports.utils.SCRIPT_IN_WINDOW_TOP || win.searches < MAX_SEARCHES_PER_WINDOW ) {
var adCandidates = win.document.querySelectorAll('img, object, embed');
adCandidates = exports.utils.realArray(adCandidates);
@ -417,7 +405,7 @@ var exports = {};
}
exports.adfinder = {
SIZE_SET: SIZE_SET,
getMatchedAdSize: getMatchedAdSize,
findAds: findAds
};
})(exports);
@ -706,7 +694,7 @@ var exports = {};
var tagfinder = {
prepToSend: function(adData) {
adData.matchedSize = exports.adfinder.SIZE_SET[adData.width + 'x' + adData.height];
adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
delete adData.width;
delete adData.height;
},
@ -821,7 +809,9 @@ var exports = {};
}
function extractAdsWrapper() {
extractAds();
if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
extractAds();
}
setTimeout(function() {
extractAdsWrapper();
}, INIT_MS_BW_SEARCHES);