Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module.exports = function (grunt) {
bonzo: '../../../../common/app/assets/javascripts/components/bonzo/bonzo',
domReady: '../../../../common/app/assets/javascripts/components/domready/ready',
EventEmitter: '../../../../common/app/assets/javascripts/components/eventEmitter/EventEmitter',
qwery: '../../../../common/app/assets/javascripts/components/qwery/qwery-mobile',
qwery: '../../../../common/app/assets/javascripts/components/qwery/qwery',
reqwest: '../../../../common/app/assets/javascripts/components/reqwest/reqwest',
lodash: '../../../../common/app/assets/javascripts/components/lodash-amd',
imager: '../../../../common/app/assets/javascripts/components/imager.js/container',
Expand Down
15 changes: 10 additions & 5 deletions common/app/assets/javascripts/bootstraps/commercial.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
define([
'bonzo',
'qwery',
'lodash/collections/forEach',
'common/utils/config',
'common/modules/userPrefs',
'common/modules/commercial/tags/container',
Expand All @@ -14,6 +15,7 @@ define([
], function (
bonzo,
qwery,
forEach,
config,
userPrefs,
tagsContainer,
Expand All @@ -29,10 +31,12 @@ define([
function init() {

// forces a commercial component on a page, for testing
[
['commercial-component', 'merchandising'],
['commercial-component-high', 'merchandising-high']
].forEach(function(data) {
forEach(
[
['commercial-component', 'merchandising'],
['commercial-component-high', 'merchandising-high']
],
function(data) {
var commercialComponent = new RegExp('^#' + data[0] + '=(.*)$').exec(window.location.hash),
slot = qwery('[data-name="' + data[1] + '"]').shift();
if (commercialComponent && slot) {
Expand All @@ -45,7 +49,8 @@ define([
loader.postLoadEvents = postLoadEvents;
loader.init(commercialComponent[1], slot);
}
});
}
);

if (!userPrefs.isOff('adverts') && !config.page.shouldHideAdverts && !config.page.isSSL) {

Expand Down
3 changes: 1 addition & 2 deletions common/app/assets/javascripts/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"bonzo": "~2.0.0",
"curl": "~0.8.9",
"qwery": "3.4.2",
"reqwest": "~1.1.0",
"reqwest": "git://github.com/guardian/reqwest.git",
"domready": "~1.0.4",
"enhancer": "0.1.1",
"videojs": "git://github.com/guardian/video.js.git#fabb393da9e139f6869bc0fdb95074d7ca062aa8",
Expand All @@ -35,7 +35,6 @@
"bower_components/curl/dist/curl-with-js-and-domReady/curl.js": "curl-domReady.js"
}
],
"qwery": "bower_components/qwery/mobile/qwery-mobile.js",
"lodash-amd": "bower_components/lodash-amd/modern/**",
"imager.js": [
"bower_components/imager.js/src/imager.js",
Expand Down
79 changes: 0 additions & 79 deletions common/app/assets/javascripts/components/qwery/qwery-mobile.js

This file was deleted.

Loading