Skip to content

Commit

Permalink
Merge branch 'gh-pages' of github.com:fightforthefuture/battleforthen…
Browse files Browse the repository at this point in the history 
…et-www into gh-pages
  • Loading branch information
@rubbingalcoholic
rubbingalcoholic committed Feb 12, 2015
2 parents c719751 + 46b5cba commit 61dac40
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 25 deletions.
5 changes: 3 additions & 2 deletions _src/js/MotherShip.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ MotherShip.prototype.hasValidReferrer = function hasValidReferrer() {

MotherShip.prototype.getHostName = function getHostName(url) {
var re = new RegExp('^(?:f|ht)tp(?:s)?\://([^/]+)', 'im');
return url.match(re)[1].toString();
var host = url.match(re)[1].toString();
return host.replace(/^www\./, '');
}

MotherShip.prototype.sendRequest = function sendRequest() {
new AJAX({
data: {
campaign: this.campaign,
data: location.href,
host: this.referrerHost.replace('www.', ''),
host: this.referrerHost,
session: GUID(),
stat: this.stat,
},
Expand Down
47 changes: 24 additions & 23 deletions js/battle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ var YourSenators = require('./YourSenators');
})();

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./AJAX":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/AJAX.js","./ActionBar":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/ActionBar.js","./Chartbeat":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Chartbeat.js","./Countdown":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Countdown.js","./DetectFeatures":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/DetectFeatures.js","./GoogleAnalytics":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/GoogleAnalytics.js","./ImagePreloader":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/ImagePreloader.js","./LoadingIcon":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/LoadingIcon.js","./MobileMenu":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/MobileMenu.js","./Modals":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Modals.js","./MotherShip":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/MotherShip.js","./OrganizationRotation":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/OrganizationRotation.js","./PetitionForm":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/PetitionForm.js","./Polyfills":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Polyfills.js","./Queue":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Queue.js","./SimpleSection":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/SimpleSection.js","./TeamInternetSection":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/TeamInternetSection.js","./YourSenators":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/YourSenators.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/AJAX.js":[function(require,module,exports){
},{"./AJAX":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\AJAX.js","./ActionBar":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\ActionBar.js","./Chartbeat":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Chartbeat.js","./Countdown":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Countdown.js","./DetectFeatures":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\DetectFeatures.js","./GoogleAnalytics":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\GoogleAnalytics.js","./ImagePreloader":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\ImagePreloader.js","./LoadingIcon":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\LoadingIcon.js","./MobileMenu":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\MobileMenu.js","./Modals":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Modals.js","./MotherShip":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\MotherShip.js","./OrganizationRotation":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\OrganizationRotation.js","./PetitionForm":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\PetitionForm.js","./Polyfills":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Polyfills.js","./Queue":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Queue.js","./SimpleSection":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\SimpleSection.js","./TeamInternetSection":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\TeamInternetSection.js","./YourSenators":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\YourSenators.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\AJAX.js":[function(require,module,exports){
function AJAX(params) {
this.async = params.async || true;
this.data = params.data;
Expand Down Expand Up @@ -474,7 +474,7 @@ AJAX.prototype.serializeForm = function(form) {

module.exports = AJAX;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/ActionBar.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\ActionBar.js":[function(require,module,exports){
(function (global){
var Template = require('./Template');

Expand Down Expand Up @@ -520,7 +520,7 @@ ActionBar.prototype.addEventListeners = function() {
module.exports = ActionBar;

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./Template":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Chartbeat.js":[function(require,module,exports){
},{"./Template":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Chartbeat.js":[function(require,module,exports){
function Chartbeat() {
this.addGlobals();
this.addScript();
Expand All @@ -546,7 +546,7 @@ Chartbeat.prototype.addScript = function addScript() {

module.exports = Chartbeat;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Countdown.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Countdown.js":[function(require,module,exports){
function Countdown(params) {
this.date = params.date;
this.interval = null;
Expand Down Expand Up @@ -648,7 +648,7 @@ Countdown.prototype.updateDates = function(difference) {

module.exports = Countdown;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/DetectFeatures.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\DetectFeatures.js":[function(require,module,exports){
function DetectFeatures() {
this.detectSVG();
}
Expand All @@ -663,7 +663,7 @@ DetectFeatures.prototype.detectSVG = function detectSVG() {

module.exports = DetectFeatures;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/GUID.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\GUID.js":[function(require,module,exports){
function GUID() {
return _p8() + _p8(true) + _p8(true) + _p8();
}
Expand All @@ -675,7 +675,7 @@ function _p8(s) {

module.exports = GUID;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/GoogleAnalytics.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\GoogleAnalytics.js":[function(require,module,exports){
function GoogleAnalytics() {
this.addScript();
}
Expand All @@ -692,7 +692,7 @@ GoogleAnalytics.prototype.addScript = function addScript() {

module.exports = GoogleAnalytics;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/ImagePreloader.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\ImagePreloader.js":[function(require,module,exports){
function ImagePreloader(src, callback) {
this.callback = callback;
this.src = src;
Expand All @@ -708,7 +708,7 @@ ImagePreloader.prototype.onLoad = function(e) {

module.exports = ImagePreloader;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/LoadingIcon.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\LoadingIcon.js":[function(require,module,exports){
var html = '<div class="timer-spinner"> <div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div> </div>';

function LoadingIcon(params) {
Expand All @@ -719,7 +719,7 @@ function LoadingIcon(params) {

module.exports = LoadingIcon;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/MobileMenu.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\MobileMenu.js":[function(require,module,exports){
function MobileMenu() {
this.root = document.getElementById('mobile-navigation');
this.list = this.root.querySelector('ul');
Expand Down Expand Up @@ -753,7 +753,7 @@ MobileMenu.prototype.updateExpansionStyles = function updateExpansionStyles() {

module.exports = MobileMenu;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Modals.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Modals.js":[function(require,module,exports){
var Template = require('./Template');

function Modals(params) {
Expand Down Expand Up @@ -836,7 +836,7 @@ Modals.prototype.addEventListeners = function() {

module.exports = Modals;

},{"./Template":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/MotherShip.js":[function(require,module,exports){
},{"./Template":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\MotherShip.js":[function(require,module,exports){
var AJAX = require('./AJAX');
var GUID = require('./GUID');

Expand Down Expand Up @@ -874,15 +874,16 @@ MotherShip.prototype.hasValidReferrer = function hasValidReferrer() {

MotherShip.prototype.getHostName = function getHostName(url) {
var re = new RegExp('^(?:f|ht)tp(?:s)?\://([^/]+)', 'im');
return url.match(re)[1].toString();
var host = url.match(re)[1].toString();
return host.replace(/^www\./, '');
}

MotherShip.prototype.sendRequest = function sendRequest() {
new AJAX({
data: {
campaign: this.campaign,
data: location.href,
host: this.referrerHost.replace('www.', ''),
host: this.referrerHost,
session: GUID(),
stat: this.stat,
},
Expand All @@ -893,7 +894,7 @@ MotherShip.prototype.sendRequest = function sendRequest() {

module.exports = MotherShip;

},{"./AJAX":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/AJAX.js","./GUID":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/GUID.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/OrganizationRotation.js":[function(require,module,exports){
},{"./AJAX":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\AJAX.js","./GUID":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\GUID.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\OrganizationRotation.js":[function(require,module,exports){
function OrganizationRotation() {
this.addEventListeners();
}
Expand Down Expand Up @@ -943,7 +944,7 @@ OrganizationRotation.prototype.addEventListeners = function() {

module.exports = OrganizationRotation;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/PetitionForm.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\PetitionForm.js":[function(require,module,exports){
(function (global){
var AJAX = require('./AJAX');
var Template = require('./Template');
Expand Down Expand Up @@ -1104,7 +1105,7 @@ PetitionForm.prototype.updateCTA = function updateCTA(cta) {
module.exports = PetitionForm;

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./AJAX":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/AJAX.js","./Template":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Polyfills.js":[function(require,module,exports){
},{"./AJAX":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\AJAX.js","./Template":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Polyfills.js":[function(require,module,exports){
function Polyfills() {
this.bind();
}
Expand Down Expand Up @@ -1136,7 +1137,7 @@ Polyfills.prototype.bind = function() {

module.exports = Polyfills;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Queue.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Queue.js":[function(require,module,exports){
function Queue(params) {
this.callback = params.callback;
this.context = params.context || this;
Expand All @@ -1159,7 +1160,7 @@ Queue.prototype.destroy = function() {

module.exports = Queue;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/SimpleSection.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\SimpleSection.js":[function(require,module,exports){
var Template = require('./Template');

function SimpleSection(params) {
Expand All @@ -1177,7 +1178,7 @@ SimpleSection.prototype.render = function() {

module.exports = SimpleSection;

},{"./Template":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/TeamInternetSection.js":[function(require,module,exports){
},{"./Template":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\TeamInternetSection.js":[function(require,module,exports){
(function (global){
var SimpleSection = require('./SimpleSection');

Expand Down Expand Up @@ -1293,7 +1294,7 @@ TeamInternetSection.prototype.hideBubble = function hideBubble() {
module.exports = TeamInternetSection;

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./SimpleSection":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/SimpleSection.js"}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js":[function(require,module,exports){
},{"./SimpleSection":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\SimpleSection.js"}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js":[function(require,module,exports){
// Simple JavaScript Templating
// John Resig - http://ejohn.org/ - MIT Licensed
var cache = {};
Expand Down Expand Up @@ -1330,7 +1331,7 @@ var Template = function template(str, data){

module.exports = Template;

},{}],"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/YourSenators.js":[function(require,module,exports){
},{}],"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\YourSenators.js":[function(require,module,exports){
(function (global){
var AJAX = require('./AJAX');
var Template = require('./Template');
Expand Down Expand Up @@ -1482,4 +1483,4 @@ YourSenators.prototype.render = function() {
module.exports = YourSenators;

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./AJAX":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/AJAX.js","./Template":"/home/jeff/Documents/htdocs/battleforthenet-www/_src/js/Template.js"}]},{},["./js/index.js"]);
},{"./AJAX":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\AJAX.js","./Template":"c:\\Users\\Chris\\projects\\battleforthenet-www\\_src\\js\\Template.js"}]},{},["./js/index.js"]);

0 comments on commit 61dac40

Please sign in to comment.