diff --git a/_src/js/index.js b/_src/js/index.js index f8efb54f9..03c0924f1 100755 --- a/_src/js/index.js +++ b/_src/js/index.js @@ -195,6 +195,14 @@ var YourSenators = require('./YourSenators'); function loadMoreSections() { var queue = []; + function loadNextSection() { + if (queue.length > 0) { + queue.shift()(); + } + } + function loadNextSectionAfterDelay(delay) { + setTimeout(loadNextSection, delay || 100); + } queue.push(function() { new AJAX({ @@ -205,9 +213,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -221,9 +227,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -237,9 +241,21 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); + } + }); + }); + + queue.push(function() { + new AJAX({ + url: 'templates/ExtraReading.html' + buster, + success: function(e) { + new SimpleSection({ + target: '.extra-reading-target', + template: e.target.responseText + }); + + loadNextSectionAfterDelay(); } }); }); @@ -253,9 +269,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -276,9 +290,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -295,9 +307,7 @@ var YourSenators = require('./YourSenators'); loadJS('js/scoreboard.js' + buster, true); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -321,9 +331,7 @@ var YourSenators = require('./YourSenators'); if (ga) ga('send', 'event', 'button', 'click', 'share_facebook'); }, false); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -348,14 +356,12 @@ var YourSenators = require('./YourSenators'); if (document.referrer.indexOf('//t.co') != -1) global.modals.display('twitter_modal'); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); // Start queue - queue.shift()(); + loadNextSection(); } })(); diff --git a/css/battle.css b/css/battle.css index d453d4f83..85746ff33 100755 --- a/css/battle.css +++ b/css/battle.css @@ -970,6 +970,30 @@ body #battle .thanks h2 { } } +/* Extra Reading */ +#battle section#extra-reading { + background-color: #313142; + font-family: "proxima-nova", sans-serif; + padding: 16px 25px 64px; +} +#battle section#extra-reading h2 { + margin-bottom: 0; +} +#battle section#extra-reading p a { + color: #20cba1; + + -webkit-transition: color 0.3s; + transition: color 0.3s; +} +#battle section#extra-reading p a:hover { + color: #2aedbd; +} +#battle section#extra-reading p .publication { + color: #ccd; + display: block; + font-size: 20px; + font-style: italic; +} diff --git a/index.html b/index.html index e9b201c95..6e8c485c6 100755 --- a/index.html +++ b/index.html @@ -355,6 +355,7 @@

+
diff --git a/js/battle.js b/js/battle.js index ebcd2b93a..254bec5a9 100755 --- a/js/battle.js +++ b/js/battle.js @@ -197,6 +197,14 @@ var YourSenators = require('./YourSenators'); function loadMoreSections() { var queue = []; + function loadNextSection() { + if (queue.length > 0) { + queue.shift()(); + } + } + function loadNextSectionAfterDelay(delay) { + setTimeout(loadNextSection, delay || 100); + } queue.push(function() { new AJAX({ @@ -207,9 +215,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -223,9 +229,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -239,9 +243,21 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); + } + }); + }); + + queue.push(function() { + new AJAX({ + url: 'templates/ExtraReading.html' + buster, + success: function(e) { + new SimpleSection({ + target: '.extra-reading-target', + template: e.target.responseText + }); + + loadNextSectionAfterDelay(); } }); }); @@ -255,9 +271,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -278,9 +292,7 @@ var YourSenators = require('./YourSenators'); template: e.target.responseText }); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -297,9 +309,7 @@ var YourSenators = require('./YourSenators'); loadJS('js/scoreboard.js' + buster, true); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -323,9 +333,7 @@ var YourSenators = require('./YourSenators'); if (ga) ga('send', 'event', 'button', 'click', 'share_facebook'); }, false); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); @@ -350,20 +358,18 @@ var YourSenators = require('./YourSenators'); if (document.referrer.indexOf('//t.co') != -1) global.modals.display('twitter_modal'); - if (queue.length > 0) { - queue.shift()(); - } + loadNextSectionAfterDelay(); } }); }); // Start queue - queue.shift()(); + loadNextSection(); } })(); }).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; @@ -474,7 +480,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'); @@ -520,7 +526,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(); @@ -546,7 +552,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; @@ -648,7 +654,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(); } @@ -663,7 +669,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(); } @@ -675,7 +681,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(); } @@ -692,7 +698,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; @@ -708,7 +714,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 = ''; function LoadingIcon(params) { @@ -719,7 +725,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'); @@ -753,7 +759,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) { @@ -836,7 +842,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'); @@ -894,7 +900,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(); } @@ -944,7 +950,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'); @@ -1105,7 +1111,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(); } @@ -1137,7 +1143,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; @@ -1160,7 +1166,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) { @@ -1178,7 +1184,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'); @@ -1294,7 +1300,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 = {}; @@ -1331,7 +1337,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'); @@ -1483,4 +1489,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"]); diff --git a/templates/ExtraReading.html b/templates/ExtraReading.html new file mode 100644 index 000000000..832cb54e2 --- /dev/null +++ b/templates/ExtraReading.html @@ -0,0 +1,150 @@ +
+

Extra Reading

+ +

+ Here are some excellent articles for additional depth. They cover the issue, its political history, the struggles we've overcome, and the fight ahead in Congress. +

+ +

+ + Everything You've Wanted To Know About Net Neutrality But Were Afraid To Ask + + + Techdirt + +

+ +

+ + A Timeline of Net Neutrality + + + Public Knowledge + +

+ +

+ + The wrong words: how the FCC lost net neutrality and could kill the internet + + + The Verge + +

+ +

+ + The wrong words: how the FCC lost net neutrality and could kill the internet + + + Business Insider + +

+ +

+ + FCC received a total of 3.7 million comments on net neutrality + + + The Verge + +

+ +

+ + How the FCC Plans to Save the Internet By Destroying It: An Explainer + + + Ryan Singel + +

+ +

+ + President Obama takes a huge leap forward on net neutrality + + + LA Times + +

+ +

+ + FCC Chief Unveils Sweeping Net-Neutrality Rules + + + National Journal + +

+ +

+ + Net neutrality battle pitches activists and FCC against Big Cable and GOP + + + The Guardian + +

+ +

+ + The GOP game plan on net neutrality + + + Politico + +

+ +

+ + New poll: Republicans and Democrats both overwhelmingly support net neutrality + + + Washington Post + +

+ +

+ + 5 Lies We Need to Stop Telling About Net Neutrality + + + Mic + +

+ +

+ + Op-Ed: Why Independent Music Fans Need Real Net Neutrality + + + Pitchfork + +

+