diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py
index b10efe216b8..6316ae6eb4f 100644
--- a/bedrock/mozorg/redirects.py
+++ b/bedrock/mozorg/redirects.py
@@ -665,4 +665,7 @@ def decider(request, **kwargs):
redirect(r'^contribute/signup/?$', 'https://activate.mozilla.community/'),
redirect(r'^/contribute/task(/.*)?', 'https://activate.mozilla.community/'),
redirect(r'^contribute/friends/?$', 'mozorg.contribute.index'),
+
+ # issue 7435
+ redirect(r'^about/history/details/?$', 'mozorg.about.history'),
)
diff --git a/bedrock/mozorg/templates/mozorg/about-base-resp.html b/bedrock/mozorg/templates/mozorg/about-base-resp.html
deleted file mode 100644
index a1e320415d6..00000000000
--- a/bedrock/mozorg/templates/mozorg/about-base-resp.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{# This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
-
-{%- set_lang_files "main" -%}
-{% extends "mozorg/base-resp.html" %}
-
-{% set navigation_bar = [
- (url('mozorg.about'), _('About Mozilla')),
- (url('mozorg.mission'), _('Mission')),
- (url('mozorg.about.history'), _('History')),
- (url('mozorg.about.leadership'), _('Leadership')),
- (url('mozorg.about.governance.governance'), _('Governance')),
- (url('mozorg.about.forums.forums'), _('Forums')),
- (url('mozorg.about.policy.patents.index'), _('Patents')),
-] -%}
-
-{% block page_css %}
- {{ css_bundle('about-base-resp') }}
-{% endblock %}
-
-{% block body_attrs %}{{ super() }} data-global-nav-current-link="about-us"{% endblock %}
-
-{% block content %}
-
-
-
-
-{% block article %}{% endblock %}
-
-
-
-
-
-
-{% endblock %}
diff --git a/bedrock/mozorg/templates/mozorg/about-base.html b/bedrock/mozorg/templates/mozorg/about-base.html
index 3125daad586..0c859f92dd9 100644
--- a/bedrock/mozorg/templates/mozorg/about-base.html
+++ b/bedrock/mozorg/templates/mozorg/about-base.html
@@ -6,7 +6,7 @@
{% extends "base-article.html" %}
{% set navigation_bar = [
- (url('mozorg.about'), 'about-governance', _('About Mozilla')),
+ (url('mozorg.about'), 'about-mozilla', _('About Mozilla')),
(url('mozorg.mission'), 'about-mission', _('Mission')),
(url('mozorg.about.history'), 'about-history', _('History')),
(url('mozorg.about.leadership'), 'about-leadership', _('Leadership')),
diff --git a/bedrock/mozorg/templates/mozorg/about/history-details.html b/bedrock/mozorg/templates/mozorg/about/history-details.html
deleted file mode 100644
index 580dc2e3f76..00000000000
--- a/bedrock/mozorg/templates/mozorg/about/history-details.html
+++ /dev/null
@@ -1,198 +0,0 @@
-{# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
-
-{% add_lang_files "mozorg/about/history-details" "mozorg/about" %}
-
-{% extends "mozorg/about-base-resp.html" %}
-
-{% block page_title %}{{ _('History of the Mozilla Project') }}{% endblock %}
-{% block body_id %}about-history{% endblock %}
-{% block body_class %}sand{% endblock %}
-
-{% block article %}
-
{{ _('History of the Mozilla Project') }}
-
-
- {% trans coderush='https://air.mozilla.org/code-rush/',
- sourcerelease='http://web.archive.org/web/20021001071727/wp.netscape.com/newsref/pr/newsrelease558.html'
- %}
- The Mozilla project was created in 1998
- with the release of the Netscape browser
- suite source code.
- {% endtrans %}
- {% trans %}
- It was intended to harness the creative power of thousands of
- programmers on the Internet and fuel unprecedented levels of
- innovation in the browser market.
- {% endtrans %}
- {% trans firstyear='http://www-archive.mozilla.org/mozilla-at-one.html' %}
- Within the first year, new community
- members from around the world had already contributed new
- functionality, enhanced existing features and became engaged in the
- management and planning of the project itself.
- {% endtrans %}
-
-
-
- {% trans stevecase='http://www-archive.mozilla.org/stevecase.html' %}
- By creating an open community, the Mozilla project had become
- larger than any one company.
- {% endtrans %}
- {% trans mission='http://www-archive.mozilla.org/mission.html',
- browsers='http://www.oreillynet.com/pub/a/mozilla/2002/09/12/mozilla_browsers.html',
- bugzilla='http://www.bugzilla.org',
- projects=url('firefox')
- %}
- Community members got involved and expanded the scope of the project’s
- original mission — instead of just working
- on Netscape’s next browser, people started creating
- a variety of browsers,
- development tools and a range of other
- projects.
- {% endtrans %}
- {% trans %}
- People contributed to Mozilla in different ways, but everyone was
- passionate about creating free software that would enable people to
- have a choice in how they experienced the Internet.
- {% endtrans %}
-
-
-
- {% trans mozilla1='http://www.mozillazine.org/articles/article2278.html' %}
- After several years of development,
- Mozilla 1.0, the first major version, was
- released in 2002. This version featured many improvements to the
- browser, email client and other applications included in the suite,
- but not many people were using it.
- {% endtrans %}
- {% trans over90='http://www.onestat.com/html/aboutus_pressbox4.html' %}
- By 2002, well over 90% of Internet users
- were browsing with Internet Explorer.
- {% endtrans %}
- {% trans charter='http://www-archive.mozilla.org/projects/firefox/charter.html' %}
- Not many people noticed at the time,
- but the first version of Phoenix (later renamed to Firefox) was also
- released by Mozilla community members that year with the goal of
- providing the best possible browsing experience
- to the widest possible set of people.
- {% endtrans %}
-
-
-
- {% trans foundation='https://blog.mozilla.org/press/2003/07/mozilla-org-announces-launch-of-the-mozilla-foundation-to-lead-open-source-browser-efforts/' %}
- In 2003, the Mozilla project created the Mozilla Foundation, an
- independent non-profit organization
- supported by individual donors and a variety of companies.
- {% endtrans %}
- {% trans manifesto=url('mozorg.about.manifesto') %}
- The new Mozilla Foundation continued the role of managing the daily
- operations of the project and also officially took on the role of
- promoting openness, innovation and opportunity
- on the Internet.
- {% endtrans %}
- {% trans grants=url('grants') %}
- It did this by continuing to release software, such as Firefox and
- Thunderbird, and expanding to new areas, such as providing
- grants to support accessibility
- improvements on the Web.
- {% endtrans %}
-
-
-
- {% trans firefox1='https://blog.mozilla.org/press/2004/11/mozilla-foundation-releases-the-highly-anticipated-mozilla-firefox-1-0-web-browser/',
- millions='https://blog.mozilla.org/press/2005/10/firefox-surpasses-100-million-downloads/'
- %}
- Firefox 1.0 was released in 2004 and
- became a big success — in less than a year, it was downloaded
- over 100 million times.
- {% endtrans %}
- {% trans %}
- New versions of Firefox have come out regularly since then and keep
- setting new records. The popularity of Firefox has helped bring choice
- back to users.
- {% endtrans %}
- {% trans innovation='https://blog.mozilla.org/press/2006/12/the-world-economic-forum-announces-technology-pioneers-2007-mozilla-selected/' %}
- The renewed competition has
- accelerated innovation and improved the
- Internet for everyone.
- {% endtrans %}
-
-
-
- {% trans firefoxos='https://support.mozilla.org/products/firefox-os' %}
- In 2013, we launched Firefox OS to
- unleash the full power of the Web on smartphones and once again offer
- control and choice to a new generation of people coming online.
- {% endtrans %}
-
-
-
- {% trans %}
- Mozilla also celebrated its 15th anniversary in 2013.
- {% endtrans %}
- {% trans %}
- The community has shown that commercial companies can benefit by
- collaborating in open source projects and that great end user products
- can be produced as open source software.
- {% endtrans %}
- {% trans all=firefox_url('desktop', 'all') %}
- More people than ever before are using the Internet and are
- experiencing it in their own language.
- {% endtrans %}
- {% trans range='http://www.wikipedia.org',
- areas='http://creativecommons.org/'
- %}
- A sustainable organization has been created that uses market mechanisms
- to support a public benefit mission and this model has been reused by
- others to create open, transparent and collaborative organizations in
- a broad range
- of areas.
- {% endtrans %}
-
-
-
- {% trans %}
- The future is full of challenges and opportunities equal to those of
- our past.
- {% endtrans %}
- {% trans %}
- There’s no guarantee that the Internet will remain open or enjoyable
- or safe.
- {% endtrans %}
- {% trans %}
- Mozilla will continue to provide an opportunity for people to make
- their voices heard and to shape their own online lives.
- {% endtrans %}
- {% trans %}
- Of course, we’re not alone in doing this.
- {% endtrans %}
- {% trans %}
- The Mozilla community, together with other open source projects and
- other public benefit organizations, exists only because of the people
- who are engaged in making our common goals a reality.
- {% endtrans %}
- {% trans contribute=url('mozorg.contribute.index') %}
- If you want to join us in our mission, please
- get involved.
- {% endtrans %}
-
-
-
- {% trans %}
- For more information about Mozilla’s history, see the following:
- {% endtrans %}
-
-{% endblock %}
diff --git a/bedrock/mozorg/templates/mozorg/about/history.html b/bedrock/mozorg/templates/mozorg/about/history.html
index 2eece6f63fc..6ea4e11e5f2 100644
--- a/bedrock/mozorg/templates/mozorg/about/history.html
+++ b/bedrock/mozorg/templates/mozorg/about/history.html
@@ -2,303 +2,200 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
-{% add_lang_files "mozorg/about/history" "mozorg/about" %}
-
-{% extends "mozorg/base-resp.html" %}
-
-{% block page_title %}{{ _('Looking back. Looking ahead.') }}{% endblock %}
-{% block body_id %}about-history{% endblock %}
-{% block body_class %}sand{% endblock %}
-{% block body_attrs %}{{ super() }} data-global-nav-current-link="about-us"{% endblock %}
-
-{% block page_css %}
- {{ css_bundle('history-slides') }}
-{% endblock %}
-
-{% block js %}
- {{ js_bundle('history-slides') }}
-{% endblock %}
-
-{% block site_header_logo %}{% endblock %}
-
-{% block content %}
-
-
-
{{ _('Looking back. Looking ahead.') }}
-
- {{ _('Mozilla exists to promote openness, innovation and opportunity on the Internet.') }}
-
- {{ _('Take a closer look at who we are, including some of our biggest achievements and milestones.') }}
-
-
-
-
-
-
-
-
-
-
-
-
- 01
-
-
- {% trans %}
- The Mozilla Project launched at Netscape on March 31, 1998, to offer choice to users and drive innovation on the Web.
- {% endtrans %}
-
-
-
-
-
-
-
-
- 02
-
-
- {% trans %}
- Proudly non-profit, Mozilla makes products like Firefox with a mission to keep the power of the Web in the hands of users everywhere.
- {% endtrans %}
-
-
-
-
-
-
-
-
-
-
- 03
-
-
- {# L10N: "The New York Times" is the proper name of an English publication and should not be translated. #}
- {% trans %}
- More than 10,000 contributors expressed their support for our mission by paying for a full-page ad in The New York Times on the day Firefox 1.0 launched in 2004.
- {% endtrans %}
-
-
-
-
-
-
-
- 04
-
-
- {% trans %}
- Today Mozilla has contributors on every continent, including Antarctica (where Firefox is used by 80% of people).
- {% endtrans %}
-
-
-
-
-
-
-
- 05
-
-
- {% if l10n_has_tag('history_nov2014') %}
- {% trans %}
- Firefox Add-Ons allow you to customize and take control of your Web experience. Nearly 4 billion of them have been downloaded by users so far.
- {% endtrans %}
- {% else %}
- {% trans %}
- Firefox Add-Ons allow you to customize and take control of your Web experience. Over 3 billion of them have been downloaded by users so far.
- {% endtrans %}
- {% endif %}
-
-
-
-
-
-
-
-
-
- 06
-
-
- {% trans %}
- Mozilla is leading the way in online privacy with browser innovations like Do Not Track and Lightbeam that give users greater control of their personal data.
- {% endtrans %}
-
-
-
-
-
-
-
- 07
-
-
- {% trans %}
- Our global community has helped translate Firefox into over 70 languages, making the browser available to more than 90% of the world's population.
- {% endtrans %}
-
-
-
-
-
-
-
- 08
-
-
- {% trans %}
- In 2008, 8,002,530 people chose Firefox in a single day to set a Guinness World Record for “Most Downloads of a Software Application in 24 Hours.”
- {% endtrans %}
-
-
-
-
-
-
-
-
- 09
-
-
- {% trans %}
- The Mozilla Festival is our largest annual event, bringing together hundreds of creative minds to realize the full power and potential of the Web.
- {% endtrans %}
-
-
-
-
-
-
-
-
-
- 10
-
-
- {% trans %}
- Mozilla Webmaker works to create a more Web-literate planet, providing tools and projects to help people take greater control of their online lives.
- {% endtrans %}
-
-
-
-
-
-
-
-
- 11
-
-
- {% if l10n_has_tag('history_nov2014') %}
- {% trans %}
- Firefox for Android brings the Firefox desktop browsing experience to phones and tablets. Available on Google Play, it has been downloaded more than 80 million times.
- {% endtrans %}
- {% else %}
- {% trans %}
- Mozilla leads the Open Badges program, an online standard that helps people gain recognition for 21st century skills and unlock new career opportunities.
- {% endtrans %}
- {% endif %}
-
-
-
-
-
-
-
-
- 12
-
-
- {% trans %}
- The Mozilla Developer Network is a community-driven Web resource that provides the best documentation, tutorials and tools available to more than 2 million visitors each month.
- {% endtrans %}
-
-
-
-
-
-
-
-
-
-
- 13
-
-
- {% trans %}
- Mozilla works to care for and preserve the Web as a shared public resource for the benefit of everyone.
- {% endtrans %}
-
-
-
-
-
-
-
- 14
-
-
- {% trans %}
- In 2013, Mozilla launched Firefox OS to unleash the full power of the Web on smartphones and once again offer control and choice to a new generation of people coming online.
- {% endtrans %}
-
-
-
-
-
-
-
-
-
-
-
- 15
-
-
- {% trans %}
- The work Mozilla does is made possible thanks to tens of thousands of volunteers who believe the Web should remain open and accessible to all.
- {% endtrans %}
-
+ {% trans coderush='https://air.mozilla.org/code-rush/',
+ sourcerelease='http://web.archive.org/web/20021001071727/wp.netscape.com/newsref/pr/newsrelease558.html'
+ %}
+ The Mozilla project was created in 1998
+ with the release of the Netscape browser
+ suite source code.
+ {% endtrans %}
+ {% trans %}
+ It was intended to harness the creative power of thousands of
+ programmers on the Internet and fuel unprecedented levels of
+ innovation in the browser market.
+ {% endtrans %}
+ {% trans firstyear='http://www-archive.mozilla.org/mozilla-at-one.html' %}
+ Within the first year, new community
+ members from around the world had already contributed new
+ functionality, enhanced existing features and became engaged in the
+ management and planning of the project itself.
+ {% endtrans %}
+
+
+
+ {% trans stevecase='http://www-archive.mozilla.org/stevecase.html' %}
+ By creating an open community, the Mozilla project had become
+ larger than any one company.
+ {% endtrans %}
+ {% trans mission='http://www-archive.mozilla.org/mission.html',
+ browsers='http://www.oreillynet.com/pub/a/mozilla/2002/09/12/mozilla_browsers.html',
+ bugzilla='http://www.bugzilla.org',
+ projects=url('firefox')
+ %}
+ Community members got involved and expanded the scope of the project’s
+ original mission — instead of just working
+ on Netscape’s next browser, people started creating
+ a variety of browsers,
+ development tools and a range of other
+ projects.
+ {% endtrans %}
+ {% trans %}
+ People contributed to Mozilla in different ways, but everyone was
+ passionate about creating free software that would enable people to
+ have a choice in how they experienced the Internet.
+ {% endtrans %}
+
+
+
+ {% trans mozilla1='http://www.mozillazine.org/articles/article2278.html' %}
+ After several years of development,
+ Mozilla 1.0, the first major version, was
+ released in 2002. This version featured many improvements to the
+ browser, email client and other applications included in the suite,
+ but not many people were using it.
+ {% endtrans %}
+ {% trans over90='http://www.onestat.com/html/aboutus_pressbox4.html' %}
+ By 2002, well over 90% of Internet users
+ were browsing with Internet Explorer.
+ {% endtrans %}
+ {% trans charter='http://www-archive.mozilla.org/projects/firefox/charter.html' %}
+ Not many people noticed at the time,
+ but the first version of Phoenix (later renamed to Firefox) was also
+ released by Mozilla community members that year with the goal of
+ providing the best possible browsing experience
+ to the widest possible set of people.
+ {% endtrans %}
+
+
+
+ {% trans foundation='https://blog.mozilla.org/press/2003/07/mozilla-org-announces-launch-of-the-mozilla-foundation-to-lead-open-source-browser-efforts/' %}
+ In 2003, the Mozilla project created the Mozilla Foundation, an
+ independent non-profit organization
+ supported by individual donors and a variety of companies.
+ {% endtrans %}
+ {% trans manifesto=url('mozorg.about.manifesto') %}
+ The new Mozilla Foundation continued the role of managing the daily
+ operations of the project and also officially took on the role of
+ promoting openness, innovation and opportunity
+ on the Internet.
+ {% endtrans %}
+ {% trans grants=url('grants') %}
+ It did this by continuing to release software, such as Firefox and
+ Thunderbird, and expanding to new areas, such as providing
+ grants to support accessibility
+ improvements on the Web.
+ {% endtrans %}
+
+
+
+ {% trans firefox1='https://blog.mozilla.org/press/2004/11/mozilla-foundation-releases-the-highly-anticipated-mozilla-firefox-1-0-web-browser/',
+ millions='https://blog.mozilla.org/press/2005/10/firefox-surpasses-100-million-downloads/'
+ %}
+ Firefox 1.0 was released in 2004 and
+ became a big success — in less than a year, it was downloaded
+ over 100 million times.
+ {% endtrans %}
+ {% trans %}
+ New versions of Firefox have come out regularly since then and keep
+ setting new records. The popularity of Firefox has helped bring choice
+ back to users.
+ {% endtrans %}
+ {% trans innovation='https://blog.mozilla.org/press/2006/12/the-world-economic-forum-announces-technology-pioneers-2007-mozilla-selected/' %}
+ The renewed competition has
+ accelerated innovation and improved the
+ Internet for everyone.
+ {% endtrans %}
+
+
+
+ {% trans firefoxos='https://support.mozilla.org/products/firefox-os' %}
+ In 2013, we launched Firefox OS to
+ unleash the full power of the Web on smartphones and once again offer
+ control and choice to a new generation of people coming online.
+ {% endtrans %}
+
+
+
+ {% trans %}
+ Mozilla also celebrated its 15th anniversary in 2013.
+ {% endtrans %}
+ {% trans %}
+ The community has shown that commercial companies can benefit by
+ collaborating in open source projects and that great end user products
+ can be produced as open source software.
+ {% endtrans %}
+ {% trans all=firefox_url('desktop', 'all') %}
+ More people than ever before are using the Internet and are
+ experiencing it in their own language.
+ {% endtrans %}
+ {% trans range='http://www.wikipedia.org',
+ areas='http://creativecommons.org/'
+ %}
+ A sustainable organization has been created that uses market mechanisms
+ to support a public benefit mission and this model has been reused by
+ others to create open, transparent and collaborative organizations in
+ a broad range
+ of areas.
+ {% endtrans %}
+
+
+
+ {% trans %}
+ The future is full of challenges and opportunities equal to those of
+ our past.
+ {% endtrans %}
+ {% trans %}
+ There’s no guarantee that the Internet will remain open or enjoyable
+ or safe.
+ {% endtrans %}
+ {% trans %}
+ Mozilla will continue to provide an opportunity for people to make
+ their voices heard and to shape their own online lives.
+ {% endtrans %}
+ {% trans %}
+ Of course, we’re not alone in doing this.
+ {% endtrans %}
+ {% trans %}
+ The Mozilla community, together with other open source projects and
+ other public benefit organizations, exists only because of the people
+ who are engaged in making our common goals a reality.
+ {% endtrans %}
+ {% trans contribute=url('mozorg.contribute.index') %}
+ If you want to join us in our mission, please
+ get involved.
+ {% endtrans %}
+
+
+
+ {% trans %}
+ For more information about Mozilla’s history, see the following:
+ {% endtrans %}
+
) Sequence consists of
-
- self.transitionsSupported = (self.prefix !== undefined) ? true : false, //determine if transitions are supported
- self.hasTouch = ("ontouchstart" in window) ? true : false, //determine if this is a touch enabled device
- self.active, //determines whether Sequence is animating
- self.navigationSkipThresholdActive = false, //when active, navigation is prevented (used to stop very fast navigation)
- self.autoPlayTimer, //the timer used for the autoPlay feature
- self.isPaused = false, //whether Sequence is paused via being hovered over
- self.isHardPaused = false, //whether Sequence is paused via a pause button
- self.mouseover = false,
- self.defaultPreloader,
- self.nextButton,
- self.prevButton,
- self.pauseButton,
- self.pauseIcon,
- self.delayUnpause,
- self.init = {
- /*functionality to initiate the preloader, next/previous buttons and so on
-
- devOption: true = the developer wants to use the default selector. false = don't use a uiElement. string = the developer defined selector to use for the UI element
- defaultOption: the default selector to use for the UI element, when the developer specifies false for devOption
- */
- uiElements: function(devOption, defaultOption) {
- switch(devOption) {
- case false: //don't set up a uiElement
- return undefined;
-
- case true: //use the default uiElement
- if(defaultOption === ".sequence-preloader") { //if setting up the preloader...
- get.defaultPreloader(self.container, self.transitionsSupported, self.prefix); //get the default preloader
- };
- return $(defaultOption); //return the default element
-
- default: //if using a developer defined selector...
- return $(devOption); //return the developer defined element
- }
- }
- };
-
- //Callbacks
- self.paused = function() {}, //executes when Sequence is paused
- self.unpaused = function() {}, //executes when Sequence is unpaused
-
- self.beforeNextFrameAnimatesIn = function() {}, //executes before the next frame animates in
- self.afterNextFrameAnimatesIn = function() {}, //executes after the next frame animates in
- self.beforeCurrentFrameAnimatesOut = function() {}, //executes before the current frame animates out
- self.afterCurrentFrameAnimatesOut = function() {}, //executes after the current frame animates out
-
- self.beforeFirstFrameAnimatesIn = function() {}, //executes before the first frame animates in
- self.afterFirstFrameAnimatesIn = function() {}, //executes after the first frame animates in
- self.beforeLastFrameAnimatesIn = function() {}, //executes before the last frame animates in
- self.afterLastFrameAnimatesIn = function() {}, //executes after the last frame animates in
-
- self.afterLoaded = function() {}; //executes after Sequence is initiated
-
- //INIT
- self.settings = $.extend({}, defaults, options); //combine default options with developer defined ones
- self.settings.preloader = self.init.uiElements(self.settings.preloader, ".sequence-preloader"); //set up the preloader and save it
- self.firstFrame = (self.settings.animateStartingFrameIn) ? true : false; //determine if the first frame should animate in
- self.settings.unpauseDelay = (self.settings.unpauseDelay === null) ? self.settings.autoPlayDelay : self.settings.unpauseDelay; //if the unpauseDelay is not specified, make it the same as the autoPlayDelay speed
- self.currentHashTag; //the current hash tag taken from the URL
- self.getHashTagFrom = (self.settings.hashDataAttribute) ? "data-sequence-hashtag": "id"; //get the hashtag from the ID or data attribute?
- self.frameHashID = []; //array that matches frames with has IDs
- self.direction = self.settings.autoPlayDirection;
-
- if(self.settings.hideFramesUntilPreloaded && self.settings.preloader) { //if using a preloader and hiding frames until preloading has completed...
- self.sequence.children("li").hide(); //hide Sequence's frames
- }
-
- if(self.prefix === "-o-") { //if Opera prefixes are required...
- self.transitionsSupported = get.operaTest(); //run a test to see if Opera correctly supports transitions (Opera 11 has bugs relating to transitions)
- }
-
- self.modifyElements(self.sequence.children("li"), "0s"); //reset transition time to 0s
- self.sequence.children("li").removeClass("animate-in"); //remove any instance of "animate-in", which should be used incase JS is disabled
-
- //functionality to run once Sequence has preloaded
- function oncePreloaded() {
- self.afterLoaded(); //callback
- if(self.settings.hideFramesUntilPreloaded && self.settings.preloader) {
- self.sequence.children("li").show();
- }
- if(self.settings.preloader){
- if(self.settings.hidePreloaderUsingCSS && self.transitionsSupported) {
- self.prependPreloadingCompleteTo = (self.settings.prependPreloadingComplete == true) ? self.settings.preloader : $(self.settings.prependPreloadingComplete);
- self.prependPreloadingCompleteTo.addClass("preloading-complete");
- setTimeout(init, self.settings.hidePreloaderDelay);
- }else{
-
- self.settings.preloader.fadeOut(self.settings.hidePreloaderDelay, function() {
- clearInterval(self.defaultPreloader);
- init();
- });
- }
- }else{
- init();
- }
- }
-
- var preloadTheseFramesLength = self.settings.preloadTheseFrames.length; //how many frames to preload?
- var preloadTheseImagesLength = self.settings.preloadTheseImages.length; //how many single images to load?
-
- if(self.settings.preloader && (preloadTheseFramesLength !== 0 || preloadTheseImagesLength !== 0)) { //if using the preloader and the dev has specified some images should preload...
- function saveImagesToArray(length, srcOnly) {
- var imagesToPreload = []; //saves the images that are to be preloaded
- if(!srcOnly){
- for(var i = length; i > 0; i--){ //for each frame to be preloaded...
- self.sequence.children("li:nth-child("+self.settings.preloadTheseFrames[i-1]+")").find("img").each(function() { //find 's in specific frames, and for each found...
- imagesToPreload.push($(this)[0]); //add it to the array of images to be preloaded
- });
- }
- }else{
- for(var i = length; i > 0; i--) { //for each frame to be preloaded...
- imagesToPreload.push($("body").find('img[src="'+self.settings.preloadTheseImages[i-1]+'"]')[0]); //find any with the given source and add it to the array of images to be preloaded
- }
- }
- return imagesToPreload;
- }
-
- var frameImagesToPreload = saveImagesToArray(preloadTheseFramesLength); //get images from particular Sequence frames to be preloaded
- var individualImagesToPreload = saveImagesToArray(preloadTheseImagesLength, true); //get images with specific source values to be preloaded
- var imagesToPreload = $(frameImagesToPreload.concat(individualImagesToPreload)); //combine frame images and individual images
- var imagesToPreloadLength = imagesToPreload.length;
-
- imagesLoaded(imagesToPreload, oncePreloaded);
- }else{ //if not using the preloader...
- $(window).bind("load", function() { //when the window loads...
- oncePreloaded(); //run the init functionality when the preloader has finished
- $(this).unbind("load"); //unbind the load event as it's no longer needed
- });
- }
-
- //jQuery imagesLoaded plugin v2.1.0 (http://github.com/desandro/imagesloaded)
- function imagesLoaded(imagesToPreload, callback) {
- BLANK = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
- var $this = imagesToPreload,
- deferred = $.isFunction($.Deferred) ? $.Deferred() : 0,
- hasNotify = $.isFunction(deferred.notify),
- $images = $this.find('img').add( $this.filter('img') ),
- loaded = [],
- proper = [],
- broken = [];
-
- //Register deferred callbacks
- if($.isPlainObject(callback)) {
- $.each(callback, function(key, value) {
- if(key === 'callback') {
- callback = value;
- }else if(deferred) {
- deferred[key](value);
- }
- });
- }
-
- function doneLoading() {
- var $proper = $(proper),
- $broken = $(broken);
-
- if(deferred) {
- if(broken.length) {
- deferred.reject($images, $proper, $broken);
- }else{
- deferred.resolve($images);
- }
- }
-
- if($.isFunction(callback)) {
- callback.call($this, $images, $proper, $broken);
- }
- }
-
- function imgLoaded( img, isBroken ) {
- if(img.src === BLANK || $.inArray(img, loaded) !== -1) { // don't proceed if BLANK image, or image is already loaded
- return;
- }
-
- loaded.push(img); // store element in loaded images array
-
- if(isBroken) { // keep track of broken and properly loaded images
- broken.push(img);
- }else{
- proper.push(img);
- }
-
- $.data(img, 'imagesLoaded', {isBroken: isBroken, src: img.src }); // cache image and its state for future calls
-
- if(hasNotify) { // trigger deferred progress method if present
- deferred.notifyWith($(img), [isBroken, $images, $(proper), $(broken)]);
- }
-
- if($images.length === loaded.length) { // call doneLoading and clean listeners if all images are loaded
- setTimeout(doneLoading);
- $images.unbind('.imagesLoaded');
- }
- }
-
- if(!$images.length) { // if no images, trigger immediately
- doneLoading();
- }else{
- $images.bind('load.imagesLoaded error.imagesLoaded', function(event) {
- imgLoaded(event.target, event.type === 'error'); // trigger imgLoaded
- }).each(function(i, el) {
- var src = el.src;
- var cached = $.data(el, 'imagesLoaded'); // find out if this image has been already checked for status if it was, and src has not changed, call imgLoaded on it
- if(cached && cached.src === src) {
- imgLoaded(el, cached.isBroken);
- return;
- }
-
- if(el.complete && el.naturalWidth !== undefined) { // if complete is true and browser supports natural sizes, try to check for image status manually
- imgLoaded(el, el.naturalWidth === 0 || el.naturalHeight === 0);
- return;
- }
-
- // cached images don't fire load sometimes, so we reset src, but only when dealing with IE, or image is complete (loaded) and failed manual check webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
- if(el.readyState || el.complete) {
- el.src = BLANK;
- el.src = src;
- }
- });
- }
- };
-
- function init() {
- $(self.settings.preloader).remove(); //remove the preloader element
-
- self.nextButton = self.init.uiElements(self.settings.nextButton, ".next"); //set up the next button
- self.prevButton = self.init.uiElements(self.settings.prevButton, ".prev"); //set up the previous button
- self.pauseButton = self.init.uiElements(self.settings.pauseButton, ".pause"); //set up the pause button
-
- if((self.nextButton !== undefined && self.nextButton !== false) && self.settings.showNextButtonOnInit){self.nextButton.show();} //if using a next button, show it
- if((self.prevButton !== undefined && self.prevButton !== false) && self.settings.showPrevButtonOnInit){self.prevButton.show();} //if using a previous button, show it
- if((self.pauseButton !== undefined && self.pauseButton !== false)){self.pauseButton.show();} //if using a pause button, show it
-
- if(self.settings.pauseIcon !== false) {
- self.pauseIcon = self.init.uiElements(self.settings.pauseIcon, ".pause-icon");
- if(self.pauseIcon !== undefined) {
- self.pauseIcon.hide();
- }
- }else{
- self.pauseIcon = undefined;
- }
-
- self.nextFrameID = self.settings.startingFrameID;
-
- if(self.settings.hashTags) { //if using hashtags...
- self.sequence.children("li").each(function() { //for each frame...
- self.frameHashID.push($(this).attr(self.getHashTagFrom)); //add the hashtag to an array
- });
-
- self.currentHashTag = location.hash.replace("#", ""); //get the current hashtag
- if(self.currentHashTag === undefined || self.currentHashTag === "") { //if there is no hashtag...
- self.nextFrameID = self.settings.startingFrameID; //use the startingFrameID
- }else{
- self.frameHashIndex = $.inArray(self.currentHashTag, self.frameHashID); //get the index of the frame that matches the hashtag
- if(self.frameHashIndex !== -1){ //if the hashtag matches a Sequence frame ID...
- self.nextFrameID = self.frameHashIndex + 1; //use the frame associated to the hashtag
- }else{
- self.nextFrameID = self.settings.startingFrameID; //use the startingFrameID
- }
- }
- }
-
- self.nextFrame = self.sequence.children("li:nth-child("+self.nextFrameID+")");
- self.nextFrameChildren = self.nextFrame.children();
-
- /* We don't want these properties forcibly applied inline. Set these dimensions and positioning in the style sheet.
- * self.sequence.css({"width": "100%", "height": "100%", "position": "relative"}); //set the sequence list to 100% width/height just incase it hasn't been specified in the CSS
- * self.sequence.children("li").css({"width": "100%", "height": "100%", "position": "absolute", "z-index": 1}); //do the same for the frames and make them absolute
- */
- if(self.transitionsSupported) { //initiate the full featured Sequence if transitions are supported...
- if(!self.settings.animateStartingFrameIn) { //start first frame in animated in position
- self.currentFrameID = self.nextFrameID;
-
- if(self.settings.moveActiveFrameToTop) {
- self.nextFrame.css("z-index", self.numberOfFrames);
- }
- self.modifyElements(self.nextFrameChildren, "0s");
- self.nextFrame.addClass("animate-in");
- if(self.settings.hashTags && self.settings.hashChangesOnFirstFrame) {
- self.currentHashTag = self.nextFrame.attr(self.getHashTagFrom);
- document.location.hash = "#"+self.currentHashTag;
- }
-
- setTimeout(function() {
- self.modifyElements(self.nextFrameChildren, "");
- }, 100);
-
- self.resetAutoPlay(true, self.settings.autoPlayDelay);
- }else if(self.settings.reverseAnimationsWhenNavigatingBackwards && self.settings.autoPlayDirection -1 && self.settings.animateStartingFrameIn) { //animate in backwards
- self.modifyElements(self.nextFrameChildren, "0s");
- self.nextFrame.addClass("animate-out");
- self.goTo(self.nextFrameID, -1);
- }else{ //animate in forwards
- self.goTo(self.nextFrameID, 1);
- }
- }else{ //initiate a basic slider for browsers that don't support CSS3 transitions
- self.container.addClass("sequence-fallback");
- self.beforeNextFrameAnimatesIn();
- self.afterNextFrameAnimatesIn();
- if(self.settings.hashTags && self.settings.hashChangesOnFirstFrame){
- self.currentHashTag = self.nextFrame.attr(self.getHashTagFrom);
- document.location.hash = "#"+self.currentHashTag;
- }
- self.currentFrameID = self.nextFrameID;
- self.sequence.children("li").addClass("animate-in");
- self.sequence.children(":not(li:nth-child("+self.nextFrameID+"))").css({"display": "none", "opacity": 0});
- self.resetAutoPlay(true, self.settings.autoPlayDelay);
- }
- //END INIT
- //EVENTS
- if(self.nextButton !== undefined) { //if a next button is defined...
- self.nextButton.click(function() { //when the next button is clicked...
- self.next(); //go to the next frame
- });
- }
-
- if(self.prevButton !== undefined) { //if a previous button is defined...
- self.prevButton.click(function() { //when the previous button is clicked...
- self.prev(); //go to the previous frame
- });
- }
-
- if(self.pauseButton !== undefined) { //if a pause button is defined...
- self.pauseButton.click(function() { //when the pause button is clicked...
- self.pause(true); //pause Sequence and set hardPause to true
- });
- }
-
- if(self.settings.keyNavigation) {
- var defaultKeys = {
- 'left' : 37,
- 'right' : 39
- };
-
- function keyEvents(keyPressed, keyDirections) {
- var keyCode;
-
- for(keyCodes in keyDirections) {
- if(keyCodes === "left" || keyCodes === "right") {
- keyCode = defaultKeys[keyCodes];
- }else{
- keyCode = keyCodes;
- }
-
- if(keyPressed === parseFloat(keyCode)) { //if the key pressed is associated with a function...
- self.initCustomKeyEvent(keyDirections[keyCodes]); //initiate the function
- }
- }
- }
-
- $(document).keydown(function(e) { //when a key is pressed...
- var glyph = String.fromCharCode(e.keyCode);
- if((glyph > 0 && glyph <= self.numberOfFrames) && (self.settings.numericKeysGoToFrames)) {
- self.nextFrameID = glyph;
- self.goTo(self.nextFrameID); //go to specified frame
- }
-
- keyEvents(e.keyCode, self.settings.keyEvents); //run default keyevents
- keyEvents(e.keyCode, self.settings.customKeyEvents); //run custom keyevents
- });
- }
-
- if(self.settings.pauseOnHover && self.settings.autoPlay && !self.hasTouch) { //if using pauseOnHover and autoPlay on non touch devices
- self.sequence.on({
- mouseenter: function() { //when the mouse enter the Sequence element...
- self.mouseover = true;
- if(!self.isHardPaused) { //if Sequence is hard paused (via a pause button)...
- self.pause(); //pause autoPlay
- }
- },
- mouseleave: function() { //when the mouse leaves the Sequence element...
- self.mouseover = false;
- if(!self.isHardPaused) { //if Sequence is not hard paused (via a pause button)...
- self.unpause(); //unpause autoPlay
- }
- }
- });
- }
-
- if(self.settings.hashTags) { //if hashchange is enabled in the settings...
- $(window).hashchange(function() { //when the hashtag changes...
- newTag = location.hash.replace("#", ""); //grab the new hashtag
-
- if(self.currentHashTag !== newTag) { //if the last hashtag is not the same as the current one...
- self.currentHashTag = newTag; //save the new tag
- self.frameHashIndex = $.inArray(self.currentHashTag, self.frameHashID); //get the index of the frame that matches the hashtag
- if(self.frameHashIndex !== -1) { //if the hashtag matches a Sequence frame ID...
- self.nextFrameID = self.frameHashIndex + 1; //set that frame as the next one
- self.goTo(self.nextFrameID); //go to the next frame
- }
- }
- });
- }
-
- if(self.settings.swipeNavigation && self.hasTouch) { //if using swipeNavigation and the device has touch capabilities...
- //jQuery TouchWipe v1.1.1 (http://www.netcu.de/jquery-touchwipe-iphone-ipad-library)
- var startX;
- var startY;
- var isMoving = false;
-
- function cancelTouch() {
- self.sequence.on("touchmove", onTouchMove);
- startX = null;
- isMoving = false;
- }
-
- function onTouchMove(e) {
- if(self.settings.swipePreventsDefault) {
- e.preventDefault();
- }
- if(isMoving) {
- var x = e.originalEvent.touches[0].pageX;
- var y = e.originalEvent.touches[0].pageY;
- var dx = startX - x;
- var dy = startY - y;
- if(Math.abs(dx) >= self.settings.swipeThreshold) {
- cancelTouch();
- if(dx > 0) {
- self.initCustomKeyEvent(self.settings.swipeEvents.left);
- }else{
- self.initCustomKeyEvent(self.settings.swipeEvents.right);
- }
- }else if(Math.abs(dy) >= self.settings.swipeThreshold) {
- cancelTouch();
- if(dy > 0) {
- self.initCustomKeyEvent(self.settings.swipeEvents.down);
- }else{
- self.initCustomKeyEvent(self.settings.swipeEvents.up);
- }
- }
- }
- }
-
- function onTouchStart(e) {
- if(e.originalEvent.touches.length == 1) {
- startX = e.originalEvent.touches[0].pageX;
- startY = e.originalEvent.touches[0].pageY;
- isMoving = true;
- self.sequence.on("touchmove", onTouchMove);
- }
- }
-
- self.sequence.on("touchstart", onTouchStart);
- }
- //END EVENTS
- }
- } //END CONSTRUCTOR
-
- Sequence.prototype = {
- //trigger keyEvents, customKeyEvents and swipeEvents
- initCustomKeyEvent: function(event) {
- var self = this;
- switch(event) {
- case "next":
- self.next();
- break;
- case "prev":
- self.prev();
- break;
- case "pause":
- self.pause(true);
- break;
- }
- },
-
- /*
- modify the transition-duration and transition-delay properties of an element
-
- elementToReset = the element that is to have it's properties modified
- cssValue = the value to be given to the transition-duration and transition-delay properties
- */
- modifyElements: function(elementToReset, cssValue) {
- var self = this;
- elementToReset.css(
- self.prefixCSS(self.prefix, {
- "transition-duration": cssValue,
- "transition-delay": cssValue
- })
- );
- },
-
- /*
- adds the browser vendors prefix onto multiple CSS properties
-
- prefix = the prefix for the browser Sequence is being viewed in (-webkit- for example)
- properties = the properties to be prefixed (transition-duration for example)
- */
- prefixCSS: function(prefix, properties) {
- var css = {};
- for(property in properties) { //for each property to be modified...
- css[prefix + property] = properties[property]; //add the prefix to the property name
- }
- return css; //return the prefixed CSS
- },
-
- setTransitionProperties: function(frameChildren) {
- var self = this;
- frameChildren.each(function() {
- self.transitionProperties["transition-duration"] = $(this).css(self.prefix + "transition-duration");
- self.transitionProperties["transition-delay"] = $(this).css(self.prefix + "transition-delay");
-
- $(this).css(
- self.prefixCSS(self.prefix, self.transitionProperties)
- );
- });
- },
-
- /*
- start autoPlay -- causing Sequence to automatically change frame every x amount of milliseconds
-
- delay: a time in ms before starting the autoPlay feature (if unspecified, the default will be used)
- */
- startAutoPlay: function(delay) {
- var self = this;
- var delay = (delay === undefined) ? self.settings.autoPlayDelay : delay; //if a delay isn't specified, use the default
- self.unpause();
-
- self.resetAutoPlay(); //stop autoPlay before starting it again
- self.autoPlayTimer = setTimeout(function() { //start a new autoPlay timer and...
- self.settings.autoPlayDirection === 1 ? self.next(): self.prev(); //go to either the next or previous frame
- }, delay); //after a specified delay
- },
-
- //stop causing Sequence to automatically change frame every x amount of seconds
- stopAutoPlay: function() {
- var self = this;
- self.pause(true);
- clearTimeout(self.autoPlayTimer); //stop the autoPlay timer
- },
-
- /*
- internal function used to start and stop autoPlay
- start: if true, autoPlay will be started, else it'll be stopped
- delay: a time in ms before starting the autoPlay feature (if unspecified, the default will be used)
- */
- resetAutoPlay: function(start, delay) {
- var self = this;
- if(start === true) { //if starting autoPlay
- if(self.settings.autoPlay && !self.isPaused) { //if using autoPlay and Sequence isn't paused...
- clearTimeout(self.autoPlayTimer); //stop the autoPlay timer
- self.autoPlayTimer = setTimeout(function() { //start a new autoPlay timer and...
- self.settings.autoPlayDirection === 1 ? self.next(): self.prev(); //go to either the next or previous frame
- }, delay); //after a specified delay
- }
- }else{ //if stopping autoPlay
- clearTimeout(self.autoPlayTimer); //stop the autoPlay timer
- }
- },
-
- /*
- Toggle startAutoPlay (unpausing autoPlay) and stopAutoPlay (pausing autoPlay)
-
- hardPause: if true, Sequence's pauseOnHover will not execute. Useful for pause buttons.
-
- Note: Sequence 0.7.3 and below didn't have an .unpause() function -- .pause() would pause/unpause
- based on the current state. .unpause() is now included for clarity but the .pause() function will
- still toggle between paused and unpaused states.
- */
- pause: function(hardPause) {
- var self = this;
- if(!self.isPaused) { //if pausing Sequence...
- if(self.pauseButton !== undefined) { //if a pause button is defined...
- self.pauseButton.addClass("paused"); //add the class of "paused" to the pause button
- if(self.pauseIcon !== undefined) { //if a pause icon is defined...
- self.pauseIcon.show(); //show the pause icon
- }
- }
- self.paused(); //callback when Sequence is paused
- self.isPaused = true;
- self.isHardPaused = (hardPause) ? true : false; //if hardPausing, set hardPause to true
- self.resetAutoPlay(); //stop autoPlay
- }else{ //if unpausing Sequence...
- self.unpause();
- }
- },
-
- /*
- Start the autoPlay feature, as well as deal with any changes to pauseButtons, pauseIcons and public variables etc
-
- callback: if false, the unpause callback will not be initiated (this is because unpause is used internally during the stop and start of each frame)
- */
- unpause: function(callback) {
- var self = this;
- if(self.pauseButton !== undefined) { //if a pause button is defined...
- self.pauseButton.removeClass("paused"); //remove the class of "paused" from the pause button
- if(self.pauseIcon !== undefined) { //if a pause icon is defined...
- self.pauseIcon.hide(); //hide the pause icon
- }
- }
-
- self.isPaused = false;
- self.isHardPaused = false;
-
- if(!self.active) {
- if(callback !== false) {
- self.unpaused(); //callback when Sequence is unpaused
- }
- self.resetAutoPlay(true, self.settings.unpauseDelay); //start autoPlay after a delay specified via the unpauseDelay setting
- }else{
- self.delayUnpause = true; //Sequence is animating so delay the unpause event until the animation completes
- }
- },
-
- //Go to the frame ahead of the current one
- next: function() {
- var self = this;
- self.nextFrameID = (self.currentFrameID !== self.numberOfFrames) ? self.currentFrameID + 1 : 1; //work out the next frame
- self.goTo(self.nextFrameID, 1); //go to the next frame
- },
-
- //Go to the frame prior to the current one
- prev: function() {
- var self = this;
- self.nextFrameID = (self.currentFrameID === 1) ? self.numberOfFrames : self.currentFrameID - 1; //work out the prev frame
- self.goTo(self.nextFrameID, -1); //go to the prev frame
- },
-
- /*
- Go to a specific frame
-
- id: number of the frame to go to
- direction: direction to get to that frame (1 = forward, -1 = reverse)
- */
- goTo: function(id, direction) {
- var self = this;
- var id = parseFloat(id); //convert the id to a number just in case
-
- if((id === self.currentFrameID) //if the id of the frame the user is trying to go to is the same as the currently active one...
- || (self.settings.navigationSkip && self.navigationSkipThresholdActive) //or navigationSkip is enabled and the navigationSkipThreshold is active (which prevents frame from being navigated too fast)...
- || (!self.settings.navigationSkip && self.active) //or navigationSkip is disbaled but Sequence is animating...
- || (!self.transitionsSupported && self.active) //or Sequence is in fallback mode and Sequence is animating...
- || (!self.settings.cycle && direction === 1 && self.currentFrameID === self.numberOfFrames) //or cycling is disabled, the user is navigating forward and this is the last frame...
- || (!self.settings.cycle && direction === -1 && self.currentFrameID === 1) //or cycling is disabled, the user is navigating backwards and this is the first frame...
- || (self.settings.preventReverseSkipping && self.direction !== direction && self.active)) { //or Sequence is animating and the user is trying to change the direction of navigation...
- return false; //don't go to another frame
- }else if(self.settings.navigationSkip && self.active) { //if navigationSkip is enabled and Sequence is animating (a frame is being skipped before it has finished animating)...
- self.navigationSkipThresholdActive = true; //the navigationSkipThreshold is now active
- if(self.settings.fadeFrameWhenSkipped) { //if a frame should fade when skipped...
- self.nextFrame.stop().animate({"opacity": 0}, self.settings.fadeFrameTime); //fade
- }
-
- navigationSkipThresholdTimer = setTimeout(function() { //start the navigationSkipThreshold timer to prevent being able to navigate too quickly
- self.navigationSkipThresholdActive = false; //once the timer is complete, navigationSkip can occur again
- }, self.settings.navigationSkipThreshold);
- }
-
- if(!self.active || self.settings.navigationSkip) { //if there are no animations running or navigationSkip is enabled...
- self.active = true; //Sequence is now animating
- self.resetAutoPlay(); //stop any autoPlay timer that may be running
-
- if(id === self.numberOfFrames) { //if navigating to the last frame...
- self.beforeLastFrameAnimatesIn(); //callback
- }else if(id === 1) { //if navigating to the first frame...
- self.beforeFirstFrameAnimatesIn(); //callback
- }
-
- if(direction === undefined) { //if no direction to navigate was defined...
- self.direction = (id > self.currentFrameID) ? 1 : -1; //work out which way to go based on what frame is currently active
- }else{
- self.direction = direction; //go to the developer defined frame
- }
-
- self.currentFrame = self.sequence.children(".animate-in"); //find which frame is active -- the frame currently being viewed (and about to be animated out)
- self.nextFrame = self.sequence.children("li:nth-child("+id+")"); //grab the next frame
- self.frameChildren = self.currentFrame.children(); //save the child elements of the current frame
- self.nextFrameChildren = self.nextFrame.children(); //save the child elements of the next frame
-
- if(self.transitionsSupported) { //if the browser supports CSS3 transitions...
- if(self.currentFrame.length !== undefined) { //if there is a current frame (one that is in it's animate-in position)...
- self.beforeCurrentFrameAnimatesOut(); //callback
- if(self.settings.moveActiveFrameToTop) { //if the active frame should move to the top...
- self.currentFrame.css("z-index", 1); //move this frame to the bottom as it is now inactive
- }
- self.modifyElements(self.nextFrameChildren, "0s"); //give the next frame elements a transition-duration and transition-delay of 0s so they don't transition to their reset position
- if(!self.settings.reverseAnimationsWhenNavigatingBackwards || self.direction === 1) { //if user hit next button...
- self.nextFrame.removeClass("animate-out"); //reset the next frame back to its starting position
- self.modifyElements(self.frameChildren, ""); //remove any inline styles from the elements to be animated so styles via the "animate-out" class can take full effect
- }else if(self.settings.reverseAnimationsWhenNavigatingBackwards && self.direction === -1) { //if the user hit prev button
- self.nextFrame.addClass("animate-out"); //reset the next frame back to its animate-out position
- self.setTransitionProperties(self.frameChildren);
- }
- }else{
- self.firstFrame = false; //no longer the first frame
- }
-
- self.active = true; //Sequence is now animating
- self.currentFrame.unbind(self.transitionEnd); //remove the animation end event
- self.nextFrame.unbind(self.transitionEnd); //remove the animation end event
-
- if(self.settings.fadeFrameWhenSkipped) { //if a frame may have faded out when it was previously skipped...
- self.nextFrame.css("opacity", 1); //show it again
- }
-
- self.beforeNextFrameAnimatesIn(); //callback
- if(self.settings.moveActiveFrameToTop) { //if an active frame should be moved to the top...
- self.nextFrame.css({"z-index": self.numberOfFrames}); //move to the top of the z-index
- }
-
- //modifications to the current and next frame's elements to get them ready to animate
- if(!self.settings.reverseAnimationsWhenNavigatingBackwards || self.direction === 1) { //if user hit next button...
- setTimeout(function() { //50ms timeout to give the browser a chance to modify the DOM sequentially
- self.modifyElements(self.nextFrameChildren, ""); //remove any inline styles from the elements to be animated so styles via the "animate-in" class can take full effect
- self.waitForAnimationsToComplete(self.nextFrame, self.nextFrameChildren, "in"); //wait for the next frame to animate in
- if(self.afterCurrentFrameAnimatesOut !== "function () {}") { //if the afterCurrentFrameAnimatesOut is being used...
- self.waitForAnimationsToComplete(self.currentFrame, self.frameChildren, "out"); //wait for the current frame to animate out as well
- }
- }, 50);
- }else if(self.settings.reverseAnimationsWhenNavigatingBackwards && self.direction === -1) { //if the user hit prev button
- setTimeout(function() { //50ms timeout to give the browser a chance to modify the DOM sequentially
- self.modifyElements(self.nextFrameChildren, ""); //remove any inline styles from the elements to be animated so styles via the "animate-in" class can take full effect
- self.setTransitionProperties(self.frameChildren);
- self.waitForAnimationsToComplete(self.nextFrame, self.nextFrameChildren, "in"); //wait for the next frame to animate in
- if(self.afterCurrentFrameAnimatesOut != "function () {}") { //if the afterCurrentFrameAnimatesOut is being used...
- self.waitForAnimationsToComplete(self.currentFrame, self.frameChildren, "out"); //wait for the current frame to animate out as well
- }
- }, 50);
- }
-
- //final class changes to make animations happen
- if(!self.settings.reverseAnimationsWhenNavigatingBackwards || self.direction === 1) { //if user hit next button...
- setTimeout(function() { //50ms timeout to give the browser a chance to modify the DOM sequentially
- self.currentFrame.toggleClass("animate-out animate-in");
- self.nextFrame.addClass("animate-in"); //add the "animate-in" class
- }, 50);
- }else if(self.settings.reverseAnimationsWhenNavigatingBackwards && self.direction === -1) { //if the user hit prev button
- setTimeout(function() { //50ms timeout to give the browser a chance to modify the DOM sequentially
- self.nextFrame.toggleClass("animate-out animate-in"); //add the "animate-in" class and remove the "animate-out" class
- self.currentFrame.removeClass("animate-in");
- }, 50);
- }
- }else{ //if the browser doesn't support CSS3 transitions...
- function animationComplete() {
- self.setHashTag();
- self.active = false;
- self.resetAutoPlay(true, self.settings.autoPlayDelay);
- }
-
- self.beforeCurrentFrameAnimatesOut(); //callback
-
- switch(self.settings.fallback.theme) {
- case "fade": //if using the fade fallback theme...
- self.sequence.children("li").css({"position": "relative"}); //this allows for fadein/out in IE
- self.currentFrame.animate({"opacity": 0}, self.settings.fallback.speed, function() { //hide the current frame
- self.currentFrame.css({"display": "none", "z-index": "1"});
- self.beforeNextFrameAnimatesIn();
- self.nextFrame.css({"display": "block", "z-index": self.numberOfFrames}).animate({"opacity": 1}, 500, function() {
- self.afterNextFrameAnimatesIn();
- }); //make the next frame the current one and show it
- animationComplete();
- });
-
- self.sequence.children("li").css({"position": "relative"}); //this allows for fadein/out in IE
- break;
-
- case "slide": //if using the slide fallback theme...
- default:
- //create objects which will save the .css() and .animation() objects
- var animateOut = {};
- var animateIn = {};
- var moveIn = {};
-
- //construct the .css() and .animation() objects
- if(self.direction === 1) {
- animateOut["left"] = "-100%";
- animateIn["left"] = "100%";
- }else{
- animateOut["left"] = "100%";
- animateIn["left"] = "-100%";
- }
-
- moveIn["left"] = "0";
- moveIn["opacity"] = 1;
-
- self.currentFrame = self.sequence.children("li:nth-child("+self.currentFrameID+")");
- self.currentFrame.animate(animateOut, self.settings.fallback.speed); //cause the current frame to animate out
- self.beforeNextFrameAnimatesIn(); //callback
- self.nextFrame.show().css(animateIn);
- self.nextFrame.animate(moveIn, self.settings.fallback.speed, function() { //cause the next frame to animate in
- animationComplete();
- self.afterNextFrameAnimatesIn(); //callback
- });
- break;
- }
- }
- self.currentFrameID = id; //make the currentFrameID the same as the one that is to animate in
- }
- },
-
- /*
- prevents the next frame from animating until the current frame has finished animating
-
- frame: the frame
which is animating
- frameChildren: the animated direct child elements of the frame
- direction: whether the elements are animating "in" to an active position or "out" of an active position
- */
- waitForAnimationsToComplete: function(frame, frameChildren, direction) {
- var self = this;
-
- if(direction === "out") { //if waiting on a frame's element to animate out...
- var onceComplete = function() {
- self.afterCurrentFrameAnimatesOut(); //callback
- };
- }else if(direction === "in") { //if waiting on a frame's element to animate in...
- var onceComplete = function() {
- self.afterNextFrameAnimatesIn(); //callback
- self.setHashTag(); //set the hashtag to represent the newly active frame
-
- if(self.currentFrameID === self.numberOfFrames) {
- self.afterLastFrameAnimatesIn(); //callback
- }else if(self.currentFrameID === 1) {
- self.afterFirstFrameAnimatesIn(); //callback
- }
-
- self.active = false; //Sequence is not animating
-
- if(!self.isHardPaused && !self.mouseover) { //if Sequence isn't hard paused (via a pause button for example) or being hovered over...
- if(!self.delayUnpause) { //if unpausing isn't delayed (Sequence wasn't animating when unpause was invoked)...
- self.unpause(false); //unpause Sequence but don't run the unpause callback
- }else{ //if unpausing was delay because Sequence was animating when unpause was invoked...
- self.delayUnpause = false;
- self.unpause(); //unpause Sequence
- }
- }
- };
- }
-
- frameChildren.data('animationEnded', false); // set the data attribute of each animated element to indicate that the animation has not yet ended
- frame.bind(self.transitionEnd, function(e) { //when an element finishes animating...
- $(e.target).data('animationEnded', true); // set the data attrbiute to indicate that the element has finished it's animation
-
- // now check if all elements have finished animating
- var allAnimationsEnded = true;
- frameChildren.each(function() { //for each element being animated within a frame...
- if($(this).data('animationEnded') === false) { //if the animation hasn't ended...
- allAnimationsEnded = false; //not all animations have ended yet
- return false; //break out of the animationEnded check early
- }
- });
-
- if(allAnimationsEnded) { //if all animations have ended...
- frame.unbind(self.transitionEnd); //stop waiting for animations to end
- onceComplete();
- }
- });
- },
-
- setHashTag: function() {
- var self = this;
- if(self.settings.hashTags) { //if hashTags is enabled...
- self.currentHashTag = self.nextFrame.attr(self.getHashTagFrom); //get the hashtag name
- self.frameHashIndex = $.inArray(self.currentHashTag, self.frameHashID); //get the index of the frame that matches the hashtag
- if(self.frameHashIndex !== -1 && (self.settings.hashChangesOnFirstFrame || (!self.firstFrame || !self.transitionsSupported))) { //if the hashtag matches a Sequence frame ID...
- self.nextFrameID = self.frameHashIndex + 1;
- document.location.hash = "#"+self.currentHashTag;
- }else{
- self.nextFrameID = self.settings.startingFrameID;
- self.firstFrame = false;
- }
- }
- }
- }; //END PROTOTYPE
-
- $.fn.sequence = function(options) {
- var self = this;
- return self.each(function() {
- var sequence = new Sequence($(this), options, defaults, get);
- $(this).data("sequence", sequence);
- });
- };
-
- //some external functions
- var get = {
- /* Modernizr 2.6.1 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-svg-prefixed-testprop-testallprops-domprefixes
- */
- modernizr: function() {
- ;window.Modernizr=function(a,b,c){function x(a){i.cssText=a}function y(a,b){return x(prefixes.join(a+";")+(b||""))}function z(a,b){return typeof a===b}function A(a,b){return!!~(""+a).indexOf(b)}function B(a,b){for(var d in a){var e=a[d];if(!A(e,"-")&&i[e]!==c)return b=="pfx"?e:!0}return!1}function C(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:z(f,"function")?f.bind(d||b):f}return!1}function D(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+m.join(d+" ")+d).split(" ");return z(b,"string")||z(b,"undefined")?B(e,b):(e=(a+" "+n.join(d+" ")+d).split(" "),C(e,b,c))}var d="2.6.1",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l="Webkit Moz O ms",m=l.split(" "),n=l.toLowerCase().split(" "),o={svg:"http://www.w3.org/2000/svg"},p={},q={},r={},s=[],t=s.slice,u,v={}.hasOwnProperty,w;!z(v,"undefined")&&!z(v.call,"undefined")?w=function(a,b){return v.call(a,b)}:w=function(a,b){return b in a&&z(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=self;if(typeof c!="function")throw new TypeError;var d=t.call(arguments,1),e=function(){if(self instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(t.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(t.call(arguments)))};return e}),p.svg=function(){return!!b.createElementNS&&!!b.createElementNS(o.svg,"svg").createSVGRect};for(var E in p)w(p,E)&&(u=E.toLowerCase(),e[u]=p[E](),s.push((e[u]?"":"no-")+u));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)w(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,enableClasses&&(f.className+=" "+(b?"":"no-")+a),e[a]=b}return e},x(""),h=j=null,e._version=d,e._domPrefixes=n,e._cssomPrefixes=m,e.testProp=function(a){return B([a])},e.testAllProps=D,e.prefixed=function(a,b,c){return b?D(a,b,c):D(a,"pfx")},e}(self,self.document);
- },
-
- defaultPreloader: function(prependTo, transitions, prefix) {
- var icon = '';
-
- $("head").append("");
- prependTo.prepend(icon);
- if(!Modernizr.svg && !transitions) { //if SVG isn't supported, remain calm and add this fallback instead...
- $(".sequence-preloader").prepend('
');
- setInterval(function(){
- $(".sequence-preloader .circle").fadeToggle(500);
- }, 500);
- }else if(!transitions){ //if transitions aren't supported, toggle the opacity instead
- setInterval(function(){
- $(".sequence-preloader").fadeToggle(500);
- }, 500);
- }
- },
-
- //a quick test to work out if Opera supports transitions properly (to work around the fact that Opera 11 supports transitions but doesn't return a transition value properly)
- operaTest: function() {
- $("body").append('');
- var $operaTest = $("#sequence-opera-test");
- $operaTest.css("-o-transition", "1s");
- //if the expected value isn't returned...
- if($operaTest.css("-o-transition") != "1s") {
- //cause Opera to go into the fallback theme
- return false;
- }else{
- return true;
- }
- $operaTest.remove();
- }
- };
-
- var defaults = {
- //General Settings
- startingFrameID: 1, //The frame (the list item `
`) that should first be displayed when Sequence loads
- cycle: true, //Whether Sequence should navigate to the first frame after the last frame and vice versa
- animateStartingFrameIn: false, //Whether the first frame should animate in to its active position
- reverseAnimationsWhenNavigatingBackwards: true, //Whether animations should be reversed when a user navigates backwards by clicking a previous button/swiping/pressing the left key
- moveActiveFrameToTop: true, //Whether a frame should be given a higher `z-index` than other frames whilst it is active, to bring it above the others
-
- //Autoplay Settings
- autoPlay: true,
- autoPlayDirection: 1,
- autoPlayDelay: 5000,
-
- //Frame Skipping Settings
- navigationSkip: true, //Whether the user can navigate through frames before each frame has finished animating
- navigationSkipThreshold: 250, //Amount of time that must pass before the next frame can be navigated to
- fadeFrameWhenSkipped: true, //If a frame is skipped before it finishes animating, it will quickly fade out
- fadeFrameTime: 150, //If fadeFrameWhenSkipped is true, how quickly a frame should fade out when skipped (in milliseconds)
- preventReverseSkipping: false, //Whether the user can change the direction of navigation during frames animating (if navigating forward, the user can only skip forwards when other frames are animating).
-
- //Next/Prev Button Settings
- nextButton: false, //if dev settings are true, the nextButton will be ".next"
- showNextButtonOnInit: true,
- prevButton: false, //if dev settings are true, the prevButton will be ".prev"
- showPrevButtonOnInit: true,
-
- //Pause Settings
- pauseButton: false, //if dev settings are true, the pauseButton will be ".pause"
- unpauseDelay: null, //the time to wait before navigating to the next frame when Sequence is unpaused. Note that if an unpauseDelay is not specified, the default is the same as the autoPlayDelay setting
- pauseOnHover: true,
- pauseIcon: false, //this is an indicator to show Sequence is paused
-
- //Preloader Settings
- preloader: false,
- preloadTheseFrames: [1], //all images in these frames will load before Sequence initiates
- preloadTheseImages: [ //specify particular images to load before Sequence initiates
- /* Example usage
- "images/catEatingSalad.jpg",
- "images/meDressedAsBatman.png"
- */
- ],
- /*Note: You can use preloadTheseFrames and preloadTheseImages together. You might want to load all images in frame 1 and just one big image from frame 2 for example*/
- hideFramesUntilPreloaded: true,
- prependPreloadingComplete: true,
- hidePreloaderUsingCSS: true,
- hidePreloaderDelay: 0,
-
- //Keyboard settings
- keyNavigation: true, //false prevents the following keyboard settings
- numericKeysGoToFrames: true,
- keyEvents: {
- left: "prev",
- right: "next"
- },
- customKeyEvents: {
- /* Example usage
- 65: "prev", //a
- 68: "next", //d
- 83: "prev", //s
- 87: "next" //w
- */
- },
-
- //Touch Swipe Settings
- swipeNavigation: true,
- swipeThreshold: 20,
- swipePreventsDefault: false, //be careful if setting this to true
- swipeEvents: {
- left: "prev",
- right: "next",
- up: false,
- down: false
- },
-
- //hashTags Settings
- //when using hashTags, please include a reference to Ben Alman's jQuery HashChange plugin above your reference to Sequence.js
-
- //info: http://benalman.com/projects/jquery-hashchange-plugin/
- //plugin: https://raw.github.com/cowboy/jquery-hashchange/v1.3/jquery.ba-hashchange.min.js
- //GitHub: https://github.com/cowboy/jquery-hashchange
- hashTags: false, //when a frame is navigated to, change the hashtag to the frames ID
- hashDataAttribute: false, //false = the hashTag is taken from a frames ID attribute | true = the hashTag is taken from the data attribute "data-sequence-hash"
- hashChangesOnFirstFrame: false,
-
- //Fallback Theme Settings (For browsers that don't support CSS3 transitions)
- fallback: {
- theme: "slide",
- speed: 500
- }
- };
-})(jQuery);
\ No newline at end of file
diff --git a/media/js/mozorg/history-slides.js b/media/js/mozorg/history-slides.js
deleted file mode 100644
index e458c7cd43f..00000000000
--- a/media/js/mozorg/history-slides.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-(function(w, $) {
- 'use strict';
-
- // default user action to auto
- var action = 'auto';
- var $window = $(window);
- var $body = $('body');
- var $slideshow = $('#slideshow');
- var hasMediaQueries = (typeof matchMedia !== 'undefined');
-
- // declare slideshow options
- var options = {
- nextButton: '.next',
- prevButton: '.prev',
- autoPlay: true,
- autoPlayDelay: 8500,
- pauseOnHover: true,
- moveActiveFrameToTop: false,
- fadeFrameWhenSkipped: false,
- animateStartingFrameIn: true,
- reverseAnimationsWhenNavigatingBackwards: true,
- preventDelayWhenReversingAnimations: true,
- swipeEvents: {
- left: 'next',
- right: 'prev',
- up: false,
- down: false
- }
- };
-
- // set up the slideshow
- // @requires: sequencejs
- // NOTE: this version of sequence relies on deprecated jQuery methods
- var slideshow = $slideshow.sequence(options).data('sequence');
-
-
- // If the browser supports media queries, check the width onload and onresize.
- // If not, just lock it in permanent wideMode.
- if (hasMediaQueries) {
- checkWidth();
- $window.on('resize', function() {
- clearTimeout(this.resizeTimeout);
- this.resizeTimeout = setTimeout(checkWidth, 200);
- });
- } else {
- $body.addClass('wide');
- $slideshow.addClass('on');
- }
-
- function checkWidth() {
- if (window.matchMedia('screen and (min-width: 1000px)').matches) {
- $body.addClass('wide');
- $slideshow.addClass('on');
- slideshow.startAutoPlay();
- } else {
- $body.removeClass('wide');
- $slideshow.removeClass('on');
- slideshow.stopAutoPlay();
- }
- }
-
-
- // Track slide views
- var track = function() {
- // must use nextFrame here - currentFrame (oddly) isn't updated yet.
- window.dataLayer.push({
- 'event': 'mozilla-slideshow',
- 'interaction': action,
- 'slide': slideshow.nextFrame[0].id
- });
-
- // reset action to autoplay
- action = 'auto';
- };
-
- // track animations when next frame comes in
- slideshow.afterNextFrameAnimatesIn = function() {
- track();
- };
-
- $('.next, .prev').on('click', function(e) {
- e.preventDefault();
- action = 'click';
- });
-
- $(document).on('keydown', function(e) {
- var key = e.keyCode;
-
- if (key === 39 || key === 37) {
- action = 'keydown';
- }
- });
-
-})(window, jQuery);
diff --git a/media/static-bundles.json b/media/static-bundles.json
index 634e3a2231a..2b55c5de78e 100644
--- a/media/static-bundles.json
+++ b/media/static-bundles.json
@@ -517,12 +517,6 @@
],
"name": "css-grid-demo"
},
- {
- "files": [
- "css/mozorg/history-slides.less"
- ],
- "name": "history-slides"
- },
{
"files": [
"css/firefox/whatsnew/whatsnew-63.scss"
@@ -565,12 +559,6 @@
],
"name": "contribute-embed"
},
- {
- "files": [
- "css/mozorg/about-base.less"
- ],
- "name": "about-base-resp"
- },
{
"files": [
"css/privacy/privacy.less"
@@ -1197,13 +1185,6 @@
],
"name": "firefox-mobile"
},
- {
- "files": [
- "js/libs/jquery.sequence.js",
- "js/mozorg/history-slides.js"
- ],
- "name": "history-slides"
- },
{
"files": [
"js/base/uitour-lib.js",
diff --git a/tests/functional/test_history.py b/tests/functional/test_history.py
deleted file mode 100644
index 3720c4c1531..00000000000
--- a/tests/functional/test_history.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import pytest
-
-from pages.history import HistoryPage
-
-
-@pytest.mark.nondestructive
-def test_slideshow_displayed(base_url, selenium):
- page = HistoryPage(selenium, base_url).open()
- assert page.is_slideshow_displayed
- assert page.is_previous_button_displayed
- assert page.is_next_button_displayed
-
-
-@pytest.mark.nondestructive
-def test_list_displayed(base_url, selenium_mobile):
- page = HistoryPage(selenium_mobile, base_url).open()
- assert not page.is_slideshow_displayed
- assert not page.is_previous_button_displayed
- assert not page.is_next_button_displayed
diff --git a/tests/pages/history.py b/tests/pages/history.py
deleted file mode 100644
index e2712a25320..00000000000
--- a/tests/pages/history.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from selenium.webdriver.common.by import By
-
-from pages.base import BasePage
-
-
-class HistoryPage(BasePage):
-
- URL_TEMPLATE = '/{locale}/about/history/'
-
- _slideshow_locator = (By.CSS_SELECTOR, '#slideshow')
- _previous_button_locator = (By.CSS_SELECTOR, '.slide-control > .prev')
- _next_button_locator = (By.CSS_SELECTOR, '.slide-control > .next')
-
- @property
- def is_slideshow_displayed(self):
- return 'on' in self.find_element(*self._slideshow_locator).get_attribute('class')
-
- @property
- def is_previous_button_displayed(self):
- return self.is_element_displayed(*self._previous_button_locator)
-
- @property
- def is_next_button_displayed(self):
- return self.is_element_displayed(*self._next_button_locator)
diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py
index c8e1a285b14..ae43ca9fad8 100644
--- a/tests/redirects/map_globalconf.py
+++ b/tests/redirects/map_globalconf.py
@@ -1267,4 +1267,7 @@
# Issue 7287
url_test('/accounts/', '/firefox/accounts/'),
+
+ # Issue 7435
+ url_test('/about/history/details/', '/about/history/'),
))