spree_showcase 0.6.0 → 0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 84f05231547b25b22da114c1f8a7251008ae7248
+  data.tar.gz: 1ab05c3f779f3e6002ffaa0b20bb673e3afd61b2
+SHA512:
+  metadata.gz: b97c677451723b85c5b4f7f4949bf01fed07f2673eb4d96b18e2395098e295068dff12bd1b78903ab6cfa6f173cd1de526fc2567303fe868e978e6f5eb25b2a6
+  data.tar.gz: 2c74992f3c6a4d639c3af636e08060ff469a71cfaa1706cb7f184f51c1a3f0d93536d1d7fa332851e0a7405c61329c38258385a0eee2325748fccfb0f54b5611

data/.gitignore

@@ -9,3 +9,4 @@ nbproject
 *.swp
 spec/dummy
 /public
+*.gem

data/README.md

@@ -1,17 +1,14 @@
 Spree Showcase
 ===========
-#### For anyone who recently upgraded on the master, please pull a file from the gem, please pull a file from the lib.
- 
-    spree_showcase/lib/generators/spree_showcase/install/assets/javascripts/store/showcase.js.erb
-    
+
 Spree Showcase is a simple extension that allows you to create the good ol' slideshow. The goal is to create a slideshow extension that makes things easy for the users and programmers. Minimal effort needed.
 
-The secondary objective is to create a slideshow template that allows most types of JS slider to be implemented easily into Spree. 
+The secondary objective is to create a slideshow template that allows most types of JS slider to be implemented easily into Spree.
 
 #### Screenshot of Frontend:
 ![Screenshot of Frontend](https://github.com/downloads/daemonsy/spree_showcase/in%20action.png)
 
-#### Admin Backend: 
+#### Admin Backend:
 ![Screenshot of Backend](https://github.com/downloads/daemonsy/spree_showcase/Screen%20Shot%202012-05-09%20at%202.07.00%20AM.png)
 
 Currently, this is the first iteration of the slideshow extension at v0.5.2. Contributors are greatly welcomed =)
@@ -28,20 +25,48 @@ Get a clean Spree Installation
 ```cd spree_demo```
 ```spree install```
 
-```gem 'spree_showcase', :git=>"git://github.com/daemonsy/spree_showcase" # Into Gemfile```
-
-OR 
+**In Gemfile**
 
 ```gem 'spree_showcase' # Ruby Gems```
 
-```bundle install```
-```rails g spree_showcase:install```
+**After That**
+
+```ruby
+bundle install
+rails g spree_showcase:install
+```
 
 **Remember** to run ```rake assets:clean```, otherwise the javascript library might not be loaded.
 
+Supports Spree 1.1 and 1.3
+
+Display
+======
+
+The default Deface override is automatically added to your Project in 
+
+    overrides/showcase/add_showcase_to_home_layout
+
+This default override acts to add the Showcase slide show to the main spree_application_home layout, 
+at the top of the #wrapper div.
+
+To change where the slide show appears, simply edit this Deface override in add_showcase_to_home_layout. 
+
+For example to add it to a home page at top of div id main-slideshow :
+
+```ruby
+Deface::Override.new(
+  :virtual_path => 'spree/home/index',
+  :name => 'add_spree_slider_to_home_index',
+  :insert_top => "#main-slideshow",
+  :partial => "spree/slides/showcase.html.erb"
+)
+
+```
+
 Testing
 -------
-No tests have been done yet. Use at your own risk! 
+No tests have been done yet. Use at your own risk!
 
 
 Copyright (c) 2012 Damon Aw, released under the New BSD License.

data/Versionfile

@@ -3,9 +3,6 @@
 
 # Examples
 #
-# '1.2.x'  => { :branch => 'master' }
-'1.1.x'  => { :tag => 'v0.5',:version=>'0.5.1' }
-# '1.0.x'  => { :branch => '1-0-stable' }
-# '0.70.x' => { :branch => '0-70-stable' }
-# '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' }
 
+'1.1.x'  => { :version=>'0.5.3' }
+'1.3.x'  => { :version => '0.6.0' }

data/app/assets/javascripts/admin/spree_showcase.js

@@ -1 +1 @@
-//= require admin/spree_core
+//= require admin/showcase

data/app/assets/javascripts/store/spree_showcase.js

@@ -1,3 +1 @@
-//= require store/spree_core
 //= require store/showcase
-

data/app/assets/stylesheets/store/spree_showcase.css

@@ -1,4 +1,3 @@
 /*
- *= require store/spree_core
  *= require store/showcase.css
 */

data/app/controllers/spree/admin/showcase_settings_controller.rb

@@ -1,7 +1,11 @@
 module Spree
   module Admin
     class ShowcaseSettingsController < BaseController
-     def show
+      helper Spree::StoreHelper
+      helper Spree::BaseHelper
+      include Spree::Core::ControllerHelpers::Order
+
+      def show
         @preferences = [:enabled,
                         :thumbnail_style,
                         :showcase_style,
@@ -14,7 +18,7 @@ module Spree
                         :animation_loop,
                         :pause_on_hover]
       end
-     
+
       def edit
         @preferences = [:enabled,
                         :thumbnail_style,
@@ -28,13 +32,13 @@ module Spree
                         :animation_loop,
                         :pause_on_hover]
       end
-     
+
       def update
         params.each do |name, value|
           next unless SpreeShowcase::Config.has_preference? name
           SpreeShowcase::Config[name] = value
         end
-     
+
         redirect_to admin_showcase_settings_path
       end
     end

data/app/controllers/spree/admin/slides_controller.rb

@@ -2,24 +2,28 @@ module Spree
   module Admin
     class SlidesController < ResourceController
       respond_to :html
-      
-      # Copied over from the Spree Core. 
+
+      # Copied over from the Spree Core.
       def update_positions
-        params[:positions].each do |id, index|
-          Slide.where(:id => id).update_all(:position => index)
+        slider_params[:positions].each do |id, index|
+          Slide.where(id: id).update_all(position: index)
         end
 
         respond_to do |format|
           format.js  { render :text => 'Ok' }
         end
-      end 
+      end
 
       def index
         @slides = Slide.all # There is a default_scope order(:position) in effect.
       end
-      
-     
-  
+
+      private
+
+      def slider_params
+        params.require(:slide).permit(:name, :body, :target_url, :published, :image, :thumbnail_message)
+      end
+
     end
   end
 end

data/app/models/spree/slide.rb

@@ -6,7 +6,7 @@ module Spree
                 :showcase=> ["#{SpreeShowcase::Config.showcase_style}"]},
       :url => '/spree/showcase/:id/:style/:basename.:extension',
       :path => ':rails_root/public/spree/showcase/:id/:style/:basename.:extension'
-    
+
     # Add S3 and Heroku support
     s3_options = if ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET']
       {
@@ -27,10 +27,9 @@ module Spree
     end
 
     attachment_definitions[:image] = (attachment_definitions[:image] || {}).merge(s3_options)
-    
+
     default_scope order(:position) # Slides should always be ordered by position specified by user.
     scope :published, where(:published=>true)
     scope :no_slides, lambda {|num| limit(num)}
-    attr_accessible :name, :body, :target_url, :published, :image, :thumbnail_message
   end
 end

data/lib/generators/spree_showcase/install/assets/overrides/showcase/add_showcase_to_home_layout.rb

@@ -6,7 +6,7 @@
 Deface::Override.new(
   :virtual_path => 'spree/layouts/spree_application',
   :name => 'add_spree_slider_to_home_index',
-  :insert_top => "#wrapper",
+  :insert_before => "#wrapper",
   :partial => "spree/slides/showcase.html.erb"
 )
 

data/lib/generators/spree_showcase/install/assets/vendor/javascripts/jquery.flexslider.js

@@ -1,54 +1,64 @@
 /*
- * jQuery FlexSlider v2.1
- * http://www.woothemes.com/flexslider/
- *
+ * jQuery FlexSlider v2.2.0
  * Copyright 2012 WooThemes
- * Free to use under the GPLv2 license.
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Contributing author: Tyler Smith (@mbmufffin)
+ * Contributing Author: Tyler Smith
  */
-
-;(function ($) {
+;
+(function ($) {
 
   //FlexSlider: Object Instance
   $.flexslider = function(el, options) {
-    var slider = $(el),
-        vars = $.extend({}, $.flexslider.defaults, options),
-        namespace = vars.namespace,
-        touch = ("ontouchstart" in window) || window.DocumentTouch && document instanceof DocumentTouch,
-        eventType = (touch) ? "touchend" : "click",
-        vertical = vars.direction === "vertical",
-        reverse = vars.reverse,
-        carousel = (vars.itemWidth > 0),
-        fade = vars.animation === "fade",
-        asNav = vars.asNavFor !== "",
-        methods = {};
-    
+    var slider = $(el);
+
+    // making variables public
+    slider.vars = $.extend({}, $.flexslider.defaults, options);
+
+    var namespace = slider.vars.namespace,
+        msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
+        touch = (( "ontouchstart" in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch) && slider.vars.touch,
+        // depricating this idea, as devices are being released with both of these events
+        //eventType = (touch) ? "touchend" : "click",
+        eventType = "click touchend MSPointerUp",
+        watchedEvent = "",
+        watchedEventClearTimer,
+        vertical = slider.vars.direction === "vertical",
+        reverse = slider.vars.reverse,
+        carousel = (slider.vars.itemWidth > 0),
+        fade = slider.vars.animation === "fade",
+        asNav = slider.vars.asNavFor !== "",
+        methods = {},
+        focused = true;
+
     // Store a reference to the slider object
     $.data(el, "flexslider", slider);
-    
-    // Privat slider methods
+
+    // Private slider methods
     methods = {
       init: function() {
         slider.animating = false;
-        slider.currentSlide = vars.startAt;
+        // Get current slide and make sure it is a number
+        slider.currentSlide = parseInt( ( slider.vars.startAt ? slider.vars.startAt : 0) );
+        if ( isNaN( slider.currentSlide ) ) slider.currentSlide = 0;
         slider.animatingTo = slider.currentSlide;
         slider.atEnd = (slider.currentSlide === 0 || slider.currentSlide === slider.last);
-        slider.containerSelector = vars.selector.substr(0,vars.selector.search(' '));
-        slider.slides = $(vars.selector, slider);
+        slider.containerSelector = slider.vars.selector.substr(0,slider.vars.selector.search(' '));
+        slider.slides = $(slider.vars.selector, slider);
         slider.container = $(slider.containerSelector, slider);
         slider.count = slider.slides.length;
         // SYNC:
-        slider.syncExists = $(vars.sync).length > 0;
+        slider.syncExists = $(slider.vars.sync).length > 0;
         // SLIDE:
-        if (vars.animation === "slide") vars.animation = "swing";
+        if (slider.vars.animation === "slide") slider.vars.animation = "swing";
         slider.prop = (vertical) ? "top" : "marginLeft";
         slider.args = {};
         // SLIDESHOW:
         slider.manualPause = false;
+        slider.stopped = false;
+        //PAUSE WHEN INVISIBLE
+        slider.started = false;
+        slider.startTimeout = null;
         // TOUCH/USECSS:
-        slider.transitions = !vars.video && !fade && vars.useCSS && (function() {
+        slider.transitions = !slider.vars.video && !fade && slider.vars.useCSS && (function() {
           var obj = document.createElement('div'),
               props = ['perspectiveProperty', 'WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective'];
           for (var i in props) {
@@ -61,76 +71,83 @@
           return false;
         }());
         // CONTROLSCONTAINER:
-        if (vars.controlsContainer !== "") slider.controlsContainer = $(vars.controlsContainer).length > 0 && $(vars.controlsContainer);
+        if (slider.vars.controlsContainer !== "") slider.controlsContainer = $(slider.vars.controlsContainer).length > 0 && $(slider.vars.controlsContainer);
         // MANUAL:
-        if (vars.manualControls !== "") slider.manualControls = $(vars.manualControls).length > 0 && $(vars.manualControls);
-        
+        if (slider.vars.manualControls !== "") slider.manualControls = $(slider.vars.manualControls).length > 0 && $(slider.vars.manualControls);
+
         // RANDOMIZE:
-        if (vars.randomize) {
+        if (slider.vars.randomize) {
           slider.slides.sort(function() { return (Math.round(Math.random())-0.5); });
           slider.container.empty().append(slider.slides);
         }
-        
+
         slider.doMath();
-        
-        // ASNAV:
-        if (asNav) methods.asNav.setup();
-        
+
         // INIT
         slider.setup("init");
-        
+
         // CONTROLNAV:
-        if (vars.controlNav) methods.controlNav.setup();
-        
+        if (slider.vars.controlNav) methods.controlNav.setup();
+
         // DIRECTIONNAV:
-        if (vars.directionNav) methods.directionNav.setup();
-        
+        if (slider.vars.directionNav) methods.directionNav.setup();
+
         // KEYBOARD:
-        if (vars.keyboard && ($(slider.containerSelector).length === 1 || vars.multipleKeyboard)) {
+        if (slider.vars.keyboard && ($(slider.containerSelector).length === 1 || slider.vars.multipleKeyboard)) {
           $(document).bind('keyup', function(event) {
             var keycode = event.keyCode;
             if (!slider.animating && (keycode === 39 || keycode === 37)) {
               var target = (keycode === 39) ? slider.getTarget('next') :
                            (keycode === 37) ? slider.getTarget('prev') : false;
-              slider.flexAnimate(target, vars.pauseOnAction);
+              slider.flexAnimate(target, slider.vars.pauseOnAction);
             }
           });
         }
         // MOUSEWHEEL:
-        if (vars.mousewheel) {
+        if (slider.vars.mousewheel) {
           slider.bind('mousewheel', function(event, delta, deltaX, deltaY) {
             event.preventDefault();
             var target = (delta < 0) ? slider.getTarget('next') : slider.getTarget('prev');
-            slider.flexAnimate(target, vars.pauseOnAction);
+            slider.flexAnimate(target, slider.vars.pauseOnAction);
           });
         }
-        
+
         // PAUSEPLAY
-        if (vars.pausePlay) methods.pausePlay.setup();
-        
+        if (slider.vars.pausePlay) methods.pausePlay.setup();
+
+        //PAUSE WHEN INVISIBLE
+        if (slider.vars.slideshow && slider.vars.pauseInvisible) methods.pauseInvisible.init();
+
         // SLIDSESHOW
-        if (vars.slideshow) {
-          if (vars.pauseOnHover) {
+        if (slider.vars.slideshow) {
+          if (slider.vars.pauseOnHover) {
             slider.hover(function() {
               if (!slider.manualPlay && !slider.manualPause) slider.pause();
             }, function() {
-              if (!slider.manualPause && !slider.manualPlay) slider.play();
+              if (!slider.manualPause && !slider.manualPlay && !slider.stopped) slider.play();
             });
           }
           // initialize animation
-          (vars.initDelay > 0) ? setTimeout(slider.play, vars.initDelay) : slider.play();
+          //If we're visible, or we don't use PageVisibility API
+          if(!slider.vars.pauseInvisible || !methods.pauseInvisible.isHidden()) {
+            (slider.vars.initDelay > 0) ? slider.startTimeout = setTimeout(slider.play, slider.vars.initDelay) : slider.play();
+          }
         }
-        
+
+        // ASNAV:
+        if (asNav) methods.asNav.setup();
+
         // TOUCH
-        if (touch && vars.touch) methods.touch();
-        
+        if (touch && slider.vars.touch) methods.touch();
+
         // FADE&&SMOOTHHEIGHT || SLIDE:
-        if (!fade || (fade && vars.smoothHeight)) $(window).bind("resize focus", methods.resize);
-        
-        
+        if (!fade || (fade && slider.vars.smoothHeight)) $(window).bind("resize orientationchange focus", methods.resize);
+
+        slider.find("img").attr("draggable", "false");
+
         // API: start() Callback
         setTimeout(function(){
-          vars.start(slider);
+          slider.vars.start(slider);
         }, 200);
       },
       asNav: {
@@ -139,15 +156,41 @@
           slider.animatingTo = Math.floor(slider.currentSlide/slider.move);
           slider.currentItem = slider.currentSlide;
           slider.slides.removeClass(namespace + "active-slide").eq(slider.currentItem).addClass(namespace + "active-slide");
-          slider.slides.click(function(e){
-            e.preventDefault();
-            var $slide = $(this),
-                target = $slide.index();
-            if (!$(vars.asNavFor).data('flexslider').animating && !$slide.hasClass('active')) {
-              slider.direction = (slider.currentItem < target) ? "next" : "prev";
-              slider.flexAnimate(target, vars.pauseOnAction, false, true, true);
-            }
-          });
+          if(!msGesture){
+              slider.slides.click(function(e){
+                e.preventDefault();
+                var $slide = $(this),
+                    target = $slide.index();
+                var posFromLeft = $slide.offset().left - $(slider).scrollLeft(); // Find position of slide relative to left of slider container
+                if( posFromLeft <= 0 && $slide.hasClass( namespace + 'active-slide' ) ) {
+                  slider.flexAnimate(slider.getTarget("prev"), true);
+                } else if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass(namespace + "active-slide")) {
+                  slider.direction = (slider.currentItem < target) ? "next" : "prev";
+                  slider.flexAnimate(target, slider.vars.pauseOnAction, false, true, true);
+                }
+              });
+          }else{
+              el._slider = slider;
+              slider.slides.each(function (){
+                  var that = this;
+                  that._gesture = new MSGesture();
+                  that._gesture.target = that;
+                  that.addEventListener("MSPointerDown", function (e){
+                      e.preventDefault();
+                      if(e.currentTarget._gesture)
+                          e.currentTarget._gesture.addPointer(e.pointerId);
+                  }, false);
+                  that.addEventListener("MSGestureTap", function (e){
+                      e.preventDefault();
+                      var $slide = $(this),
+                          target = $slide.index();
+                      if (!$(slider.vars.asNavFor).data('flexslider').animating && !$slide.hasClass('active')) {
+                          slider.direction = (slider.currentItem < target) ? "next" : "prev";
+                          slider.flexAnimate(target, slider.vars.pauseOnAction, false, true, true);
+                      }
+                  });
+              });
+          }
         }
       },
       controlNav: {
@@ -159,66 +202,79 @@
           }
         },
         setupPaging: function() {
-          var type = (vars.controlNav === "thumbnails") ? 'control-thumbs' : 'control-paging',
+          var type = (slider.vars.controlNav === "thumbnails") ? 'control-thumbs' : 'control-paging',
               j = 1,
-              item;
-          
+              item,
+              slide;
+
           slider.controlNavScaffold = $('<ol class="'+ namespace + 'control-nav ' + namespace + type + '"></ol>');
-          
+
           if (slider.pagingCount > 1) {
             for (var i = 0; i < slider.pagingCount; i++) {
-              item = (vars.controlNav === "thumbnails") ? '<img src="' + slider.slides.eq(i).attr("data-thumb") + '"/>' : '<a>' + j + '</a>';
+              slide = slider.slides.eq(i);
+              item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"/>' : '<a>' + j + '</a>';
+              if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
+                var captn = slide.attr( 'data-thumbcaption' );
+                if ( '' != captn && undefined != captn ) item += '<span class="' + namespace + 'caption">' + captn + '</span>';
+              }
               slider.controlNavScaffold.append('<li>' + item + '</li>');
               j++;
             }
           }
-          
+
           // CONTROLSCONTAINER:
           (slider.controlsContainer) ? $(slider.controlsContainer).append(slider.controlNavScaffold) : slider.append(slider.controlNavScaffold);
           methods.controlNav.set();
-          
+
           methods.controlNav.active();
-        
+
           slider.controlNavScaffold.delegate('a, img', eventType, function(event) {
             event.preventDefault();
-            var $this = $(this),
-                target = slider.controlNav.index($this);
 
-            if (!$this.hasClass(namespace + 'active')) {
-              slider.direction = (target > slider.currentSlide) ? "next" : "prev";
-              slider.flexAnimate(target, vars.pauseOnAction);
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              var $this = $(this),
+                  target = slider.controlNav.index($this);
+
+              if (!$this.hasClass(namespace + 'active')) {
+                slider.direction = (target > slider.currentSlide) ? "next" : "prev";
+                slider.flexAnimate(target, slider.vars.pauseOnAction);
+              }
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
             }
+            methods.setToClearWatchedEvent();
+
           });
-          // Prevent iOS click event bug
-          if (touch) {
-            slider.controlNavScaffold.delegate('a', "click touchstart", function(event) {
-              event.preventDefault();
-            });
-          }
         },
         setupManual: function() {
           slider.controlNav = slider.manualControls;
           methods.controlNav.active();
-          
-          slider.controlNav.live(eventType, function(event) {
+
+          slider.controlNav.bind(eventType, function(event) {
             event.preventDefault();
-            var $this = $(this),
-                target = slider.controlNav.index($this);
-                
-            if (!$this.hasClass(namespace + 'active')) {
-              (target > slider.currentSlide) ? slider.direction = "next" : slider.direction = "prev";
-              slider.flexAnimate(target, vars.pauseOnAction);
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              var $this = $(this),
+                  target = slider.controlNav.index($this);
+
+              if (!$this.hasClass(namespace + 'active')) {
+                (target > slider.currentSlide) ? slider.direction = "next" : slider.direction = "prev";
+                slider.flexAnimate(target, slider.vars.pauseOnAction);
+              }
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
             }
+            methods.setToClearWatchedEvent();
           });
-          // Prevent iOS click event bug
-          if (touch) {
-            slider.controlNav.live("click touchstart", function(event) {
-              event.preventDefault();
-            });
-          }
         },
         set: function() {
-          var selector = (vars.controlNav === "thumbnails") ? 'img' : 'a';
+          var selector = (slider.vars.controlNav === "thumbnails") ? 'img' : 'a';
           slider.controlNav = $('.' + namespace + 'control-nav li ' + selector, (slider.controlsContainer) ? slider.controlsContainer : slider);
         },
         active: function() {
@@ -238,8 +294,8 @@
       },
       directionNav: {
         setup: function() {
-          var directionNavScaffold = $('<ul class="' + namespace + 'direction-nav"><li><a class="' + namespace + 'prev" href="#">' + vars.prevText + '</a></li><li><a class="' + namespace + 'next" href="#">' + vars.nextText + '</a></li></ul>');
-        
+          var directionNavScaffold = $('<ul class="' + namespace + 'direction-nav"><li><a class="' + namespace + 'prev" href="#">' + slider.vars.prevText + '</a></li><li><a class="' + namespace + 'next" href="#">' + slider.vars.nextText + '</a></li></ul>');
+
           // CONTROLSCONTAINER:
           if (slider.controlsContainer) {
             $(slider.controlsContainer).append(directionNavScaffold);
@@ -248,42 +304,46 @@
             slider.append(directionNavScaffold);
             slider.directionNav = $('.' + namespace + 'direction-nav li a', slider);
           }
-        
+
           methods.directionNav.update();
-        
+
           slider.directionNav.bind(eventType, function(event) {
             event.preventDefault();
-            var target = ($(this).hasClass(namespace + 'next')) ? slider.getTarget('next') : slider.getTarget('prev');
-            slider.flexAnimate(target, vars.pauseOnAction);
+            var target;
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              target = ($(this).hasClass(namespace + 'next')) ? slider.getTarget('next') : slider.getTarget('prev');
+              slider.flexAnimate(target, slider.vars.pauseOnAction);
+            }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
           });
-          // Prevent iOS click event bug
-          if (touch) {
-            slider.directionNav.bind("click touchstart", function(event) {
-              event.preventDefault();
-            });
-          }
         },
         update: function() {
           var disabledClass = namespace + 'disabled';
           if (slider.pagingCount === 1) {
-            slider.directionNav.addClass(disabledClass);
-          } else if (!vars.animationLoop) {
+            slider.directionNav.addClass(disabledClass).attr('tabindex', '-1');
+          } else if (!slider.vars.animationLoop) {
             if (slider.animatingTo === 0) {
-              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "prev").addClass(disabledClass);
+              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "prev").addClass(disabledClass).attr('tabindex', '-1');
             } else if (slider.animatingTo === slider.last) {
-              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "next").addClass(disabledClass);
+              slider.directionNav.removeClass(disabledClass).filter('.' + namespace + "next").addClass(disabledClass).attr('tabindex', '-1');
             } else {
-              slider.directionNav.removeClass(disabledClass);
+              slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
             }
           } else {
-            slider.directionNav.removeClass(disabledClass);
+            slider.directionNav.removeClass(disabledClass).removeAttr('tabindex');
           }
         }
       },
       pausePlay: {
         setup: function() {
           var pausePlayScaffold = $('<div class="' + namespace + 'pauseplay"><a></a></div>');
-        
+
           // CONTROLSCONTAINER:
           if (slider.controlsContainer) {
             slider.controlsContainer.append(pausePlayScaffold);
@@ -293,29 +353,32 @@
             slider.pausePlay = $('.' + namespace + 'pauseplay a', slider);
           }
 
-          methods.pausePlay.update((vars.slideshow) ? namespace + 'pause' : namespace + 'play');
+          methods.pausePlay.update((slider.vars.slideshow) ? namespace + 'pause' : namespace + 'play');
 
           slider.pausePlay.bind(eventType, function(event) {
             event.preventDefault();
-            if ($(this).hasClass(namespace + 'pause')) {
-              slider.manualPause = true;
-              slider.manualPlay = false;
-              slider.pause();
-            } else {
-              slider.manualPause = false;
-              slider.manualPlay = true;
-              slider.play();
+
+            if (watchedEvent === "" || watchedEvent === event.type) {
+              if ($(this).hasClass(namespace + 'pause')) {
+                slider.manualPause = true;
+                slider.manualPlay = false;
+                slider.pause();
+              } else {
+                slider.manualPause = false;
+                slider.manualPlay = true;
+                slider.play();
+              }
             }
+
+            // setup flags to prevent event duplication
+            if (watchedEvent === "") {
+              watchedEvent = event.type;
+            }
+            methods.setToClearWatchedEvent();
           });
-          // Prevent iOS click event bug
-          if (touch) {
-            slider.pausePlay.bind("click touchstart", function(event) {
-              event.preventDefault();
-            });
-          }
         },
         update: function(state) {
-          (state === "play") ? slider.pausePlay.removeClass(namespace + 'pause').addClass(namespace + 'play').text(vars.playText) : slider.pausePlay.removeClass(namespace + 'play').addClass(namespace + 'pause').text(vars.pauseText);
+          (state === "play") ? slider.pausePlay.removeClass(namespace + 'pause').addClass(namespace + 'play').html(slider.vars.playText) : slider.pausePlay.removeClass(namespace + 'play').addClass(namespace + 'pause').html(slider.vars.pauseText);
         }
       },
       touch: function() {
@@ -325,71 +388,175 @@
           cwidth,
           dx,
           startT,
-          scrolling = false;
-              
-        el.addEventListener('touchstart', onTouchStart, false);
-        function onTouchStart(e) {
-          if (slider.animating) {
-            e.preventDefault();
-          } else if (e.touches.length === 1) {
-            slider.pause();
-            // CAROUSEL: 
-            cwidth = (vertical) ? slider.h : slider. w;
-            startT = Number(new Date());
-            // CAROUSEL:
-            offset = (carousel && reverse && slider.animatingTo === slider.last) ? 0 :
-                     (carousel && reverse) ? slider.limit - (((slider.itemW + vars.itemMargin) * slider.move) * slider.animatingTo) :
-                     (carousel && slider.currentSlide === slider.last) ? slider.limit :
-                     (carousel) ? ((slider.itemW + vars.itemMargin) * slider.move) * slider.currentSlide : 
-                     (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
-            startX = (vertical) ? e.touches[0].pageY : e.touches[0].pageX;
-            startY = (vertical) ? e.touches[0].pageX : e.touches[0].pageY;
-
-            el.addEventListener('touchmove', onTouchMove, false);
-            el.addEventListener('touchend', onTouchEnd, false);
-          }
-        }
+          scrolling = false,
+          localX = 0,
+          localY = 0,
+          accDx = 0;
 
-        function onTouchMove(e) {
-          dx = (vertical) ? startX - e.touches[0].pageY : startX - e.touches[0].pageX;
-          scrolling = (vertical) ? (Math.abs(dx) < Math.abs(e.touches[0].pageX - startY)) : (Math.abs(dx) < Math.abs(e.touches[0].pageY - startY));
-          
-          if (!scrolling || Number(new Date()) - startT > 500) {
-            e.preventDefault();
-            if (!fade && slider.transitions) {
-              if (!vars.animationLoop) {
-                dx = dx/((slider.currentSlide === 0 && dx < 0 || slider.currentSlide === slider.last && dx > 0) ? (Math.abs(dx)/cwidth+2) : 1);
+        if(!msGesture){
+            el.addEventListener('touchstart', onTouchStart, false);
+
+            function onTouchStart(e) {
+              if (slider.animating) {
+                e.preventDefault();
+              } else if ( ( window.navigator.msPointerEnabled ) || e.touches.length === 1 ) {
+                slider.pause();
+                // CAROUSEL:
+                cwidth = (vertical) ? slider.h : slider. w;
+                startT = Number(new Date());
+                // CAROUSEL:
+
+                // Local vars for X and Y points.
+                localX = e.touches[0].pageX;
+                localY = e.touches[0].pageY;
+
+                offset = (carousel && reverse && slider.animatingTo === slider.last) ? 0 :
+                         (carousel && reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
+                         (carousel && slider.currentSlide === slider.last) ? slider.limit :
+                         (carousel) ? ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.currentSlide :
+                         (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
+                startX = (vertical) ? localY : localX;
+                startY = (vertical) ? localX : localY;
+
+                el.addEventListener('touchmove', onTouchMove, false);
+                el.addEventListener('touchend', onTouchEnd, false);
               }
-              slider.setProps(offset + dx, "setTouch");
             }
-          }
-        }
-        
-        function onTouchEnd(e) {
-          // finish the touch by undoing the touch session
-          el.removeEventListener('touchmove', onTouchMove, false);
-          
-          if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
-            var updateDx = (reverse) ? -dx : dx,
-                target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
-            
-            if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
-              slider.flexAnimate(target, vars.pauseOnAction);
-            } else {
-              if (!fade) slider.flexAnimate(slider.currentSlide, vars.pauseOnAction, true);
+
+            function onTouchMove(e) {
+              // Local vars for X and Y points.
+
+              localX = e.touches[0].pageX;
+              localY = e.touches[0].pageY;
+
+              dx = (vertical) ? startX - localY : startX - localX;
+              scrolling = (vertical) ? (Math.abs(dx) < Math.abs(localX - startY)) : (Math.abs(dx) < Math.abs(localY - startY));
+
+              var fxms = 500;
+
+              if ( ! scrolling || Number( new Date() ) - startT > fxms ) {
+                e.preventDefault();
+                if (!fade && slider.transitions) {
+                  if (!slider.vars.animationLoop) {
+                    dx = dx/((slider.currentSlide === 0 && dx < 0 || slider.currentSlide === slider.last && dx > 0) ? (Math.abs(dx)/cwidth+2) : 1);
+                  }
+                  slider.setProps(offset + dx, "setTouch");
+                }
+              }
+            }
+
+            function onTouchEnd(e) {
+              // finish the touch by undoing the touch session
+              el.removeEventListener('touchmove', onTouchMove, false);
+
+              if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
+                var updateDx = (reverse) ? -dx : dx,
+                    target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
+
+                if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
+                  slider.flexAnimate(target, slider.vars.pauseOnAction);
+                } else {
+                  if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
+                }
+              }
+              el.removeEventListener('touchend', onTouchEnd, false);
+
+              startX = null;
+              startY = null;
+              dx = null;
+              offset = null;
+            }
+        }else{
+            el.style.msTouchAction = "none";
+            el._gesture = new MSGesture();
+            el._gesture.target = el;
+            el.addEventListener("MSPointerDown", onMSPointerDown, false);
+            el._slider = slider;
+            el.addEventListener("MSGestureChange", onMSGestureChange, false);
+            el.addEventListener("MSGestureEnd", onMSGestureEnd, false);
+
+            function onMSPointerDown(e){
+                e.stopPropagation();
+                if (slider.animating) {
+                    e.preventDefault();
+                }else{
+                    slider.pause();
+                    el._gesture.addPointer(e.pointerId);
+                    accDx = 0;
+                    cwidth = (vertical) ? slider.h : slider. w;
+                    startT = Number(new Date());
+                    // CAROUSEL:
+
+                    offset = (carousel && reverse && slider.animatingTo === slider.last) ? 0 :
+                        (carousel && reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
+                            (carousel && slider.currentSlide === slider.last) ? slider.limit :
+                                (carousel) ? ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.currentSlide :
+                                    (reverse) ? (slider.last - slider.currentSlide + slider.cloneOffset) * cwidth : (slider.currentSlide + slider.cloneOffset) * cwidth;
+                }
+            }
+
+            function onMSGestureChange(e) {
+                e.stopPropagation();
+                var slider = e.target._slider;
+                if(!slider){
+                    return;
+                }
+                var transX = -e.translationX,
+                    transY = -e.translationY;
+
+                //Accumulate translations.
+                accDx = accDx + ((vertical) ? transY : transX);
+                dx = accDx;
+                scrolling = (vertical) ? (Math.abs(accDx) < Math.abs(-transX)) : (Math.abs(accDx) < Math.abs(-transY));
+
+                if(e.detail === e.MSGESTURE_FLAG_INERTIA){
+                    setImmediate(function (){
+                        el._gesture.stop();
+                    });
+
+                    return;
+                }
+
+                if (!scrolling || Number(new Date()) - startT > 500) {
+                    e.preventDefault();
+                    if (!fade && slider.transitions) {
+                        if (!slider.vars.animationLoop) {
+                            dx = accDx / ((slider.currentSlide === 0 && accDx < 0 || slider.currentSlide === slider.last && accDx > 0) ? (Math.abs(accDx) / cwidth + 2) : 1);
+                        }
+                        slider.setProps(offset + dx, "setTouch");
+                    }
+                }
+            }
+
+            function onMSGestureEnd(e) {
+                e.stopPropagation();
+                var slider = e.target._slider;
+                if(!slider){
+                    return;
+                }
+                if (slider.animatingTo === slider.currentSlide && !scrolling && !(dx === null)) {
+                    var updateDx = (reverse) ? -dx : dx,
+                        target = (updateDx > 0) ? slider.getTarget('next') : slider.getTarget('prev');
+
+                    if (slider.canAdvance(target) && (Number(new Date()) - startT < 550 && Math.abs(updateDx) > 50 || Math.abs(updateDx) > cwidth/2)) {
+                        slider.flexAnimate(target, slider.vars.pauseOnAction);
+                    } else {
+                        if (!fade) slider.flexAnimate(slider.currentSlide, slider.vars.pauseOnAction, true);
+                    }
+                }
+
+                startX = null;
+                startY = null;
+                dx = null;
+                offset = null;
+                accDx = 0;
             }
-          }
-          el.removeEventListener('touchend', onTouchEnd, false);
-          startX = null;
-          startY = null;
-          dx = null;
-          offset = null;
         }
       },
       resize: function() {
         if (!slider.animating && slider.is(':visible')) {
           if (!carousel) slider.doMath();
-          
+
           if (fade) {
             // SMOOTH HEIGHT:
             methods.smoothHeight();
@@ -403,7 +570,7 @@
             slider.setProps(slider.h, "setTotal");
           } else {
             // SMOOTH HEIGHT:
-            if (vars.smoothHeight) methods.smoothHeight();
+            if (slider.vars.smoothHeight) methods.smoothHeight();
             slider.newSlides.width(slider.computedW);
             slider.setProps(slider.computedW, "setTotal");
           }
@@ -416,29 +583,67 @@
         }
       },
       sync: function(action) {
-        var $obj = $(vars.sync).data("flexslider"),
+        var $obj = $(slider.vars.sync).data("flexslider"),
             target = slider.animatingTo;
-        
+
         switch (action) {
-          case "animate": $obj.flexAnimate(target, vars.pauseOnAction, false, true); break;
+          case "animate": $obj.flexAnimate(target, slider.vars.pauseOnAction, false, true); break;
           case "play": if (!$obj.playing && !$obj.asNav) { $obj.play(); } break;
           case "pause": $obj.pause(); break;
         }
+      },
+      pauseInvisible: {
+        visProp: null,
+        init: function() {
+          var prefixes = ['webkit','moz','ms','o'];
+
+          if ('hidden' in document) return 'hidden';
+          for (var i = 0; i < prefixes.length; i++) {
+            if ((prefixes[i] + 'Hidden') in document) 
+            methods.pauseInvisible.visProp = prefixes[i] + 'Hidden';
+          }
+          if (methods.pauseInvisible.visProp) {
+            var evtname = methods.pauseInvisible.visProp.replace(/[H|h]idden/,'') + 'visibilitychange';
+            document.addEventListener(evtname, function() {
+              if (methods.pauseInvisible.isHidden()) {
+                if(slider.startTimeout) clearTimeout(slider.startTimeout); //If clock is ticking, stop timer and prevent from starting while invisible
+                else slider.pause(); //Or just pause
+              }
+              else {
+                if(slider.started) slider.play(); //Initiated before, just play
+                else (slider.vars.initDelay > 0) ? setTimeout(slider.play, slider.vars.initDelay) : slider.play(); //Didn't init before: simply init or wait for it
+              }
+            });
+          }       
+        },
+        isHidden: function() {
+          return document[methods.pauseInvisible.visProp] || false;
+        }
+      },
+      setToClearWatchedEvent: function() {
+        clearTimeout(watchedEventClearTimer);
+        watchedEventClearTimer = setTimeout(function() {
+          watchedEvent = "";
+        }, 3000);
       }
     }
-    
+
     // public methods
     slider.flexAnimate = function(target, pause, override, withSync, fromNav) {
+      if (!slider.vars.animationLoop && target !== slider.currentSlide) {
+        slider.direction = (target > slider.currentSlide) ? "next" : "prev";
+      }
+
       if (asNav && slider.pagingCount === 1) slider.direction = (slider.currentItem < target) ? "next" : "prev";
-      
+
       if (!slider.animating && (slider.canAdvance(target, fromNav) || override) && slider.is(":visible")) {
         if (asNav && withSync) {
-          var master = $(vars.asNavFor).data('flexslider');
+          var master = $(slider.vars.asNavFor).data('flexslider');
           slider.atEnd = target === 0 || target === slider.count - 1;
           master.flexAnimate(target, true, false, true, fromNav);
           slider.direction = (slider.currentItem < target) ? "next" : "prev";
           master.direction = slider.direction;
-          
+
           if (Math.ceil((target + 1)/slider.visible) - 1 !== slider.currentSlide && target !== 0) {
             slider.currentItem = target;
             slider.slides.removeClass(namespace + "active-slide").eq(target).addClass(namespace + "active-slide");
@@ -449,59 +654,61 @@
             return false;
           }
         }
-        
+
         slider.animating = true;
         slider.animatingTo = target;
-        // API: before() animation Callback
-        vars.before(slider);
-        
+
         // SLIDESHOW:
         if (pause) slider.pause();
-        
+
+        // API: before() animation Callback
+        slider.vars.before(slider);
+
         // SYNC:
         if (slider.syncExists && !fromNav) methods.sync("animate");
-        
+
         // CONTROLNAV
-        if (vars.controlNav) methods.controlNav.active();
-        
+        if (slider.vars.controlNav) methods.controlNav.active();
+
         // !CAROUSEL:
         // CANDIDATE: slide active class (for add/remove slide)
         if (!carousel) slider.slides.removeClass(namespace + 'active-slide').eq(target).addClass(namespace + 'active-slide');
-        
+
         // INFINITE LOOP:
         // CANDIDATE: atEnd
         slider.atEnd = target === 0 || target === slider.last;
-        
+
         // DIRECTIONNAV:
-        if (vars.directionNav) methods.directionNav.update();
-        
+        if (slider.vars.directionNav) methods.directionNav.update();
+
         if (target === slider.last) {
           // API: end() of cycle Callback
-          vars.end(slider);
+          slider.vars.end(slider);
           // SLIDESHOW && !INFINITE LOOP:
-          if (!vars.animationLoop) slider.pause();
+          if (!slider.vars.animationLoop) slider.pause();
         }
-        
+
         // SLIDE:
         if (!fade) {
           var dimension = (vertical) ? slider.slides.filter(':first').height() : slider.computedW,
               margin, slideString, calcNext;
-          
+
           // INFINITE LOOP / REVERSE:
           if (carousel) {
-            margin = (vars.itemWidth > slider.w) ? vars.itemMargin * 2 : vars.itemMargin;
+            //margin = (slider.vars.itemWidth > slider.w) ? slider.vars.itemMargin * 2 : slider.vars.itemMargin;
+            margin = slider.vars.itemMargin;
             calcNext = ((slider.itemW + margin) * slider.move) * slider.animatingTo;
             slideString = (calcNext > slider.limit && slider.visible !== 1) ? slider.limit : calcNext;
-          } else if (slider.currentSlide === 0 && target === slider.count - 1 && vars.animationLoop && slider.direction !== "next") {
+          } else if (slider.currentSlide === 0 && target === slider.count - 1 && slider.vars.animationLoop && slider.direction !== "next") {
             slideString = (reverse) ? (slider.count + slider.cloneOffset) * dimension : 0;
-          } else if (slider.currentSlide === slider.last && target === 0 && vars.animationLoop && slider.direction !== "prev") {
+          } else if (slider.currentSlide === slider.last && target === 0 && slider.vars.animationLoop && slider.direction !== "prev") {
             slideString = (reverse) ? 0 : (slider.count + 1) * dimension;
           } else {
             slideString = (reverse) ? ((slider.count - 1) - target + slider.cloneOffset) * dimension : (target + slider.cloneOffset) * dimension;
           }
-          slider.setProps(slideString, "", vars.animationSpeed);
+          slider.setProps(slideString, "", slider.vars.animationSpeed);
           if (slider.transitions) {
-            if (!vars.animationLoop || !slider.atEnd) {
+            if (!slider.vars.animationLoop || !slider.atEnd) {
               slider.animating = false;
               slider.currentSlide = slider.animatingTo;
             }
@@ -510,69 +717,72 @@
               slider.wrapup(dimension);
             });
           } else {
-            slider.container.animate(slider.args, vars.animationSpeed, vars.easing, function(){
+            slider.container.animate(slider.args, slider.vars.animationSpeed, slider.vars.easing, function(){
               slider.wrapup(dimension);
             });
           }
         } else { // FADE:
           if (!touch) {
-            slider.slides.eq(slider.currentSlide).fadeOut(vars.animationSpeed, vars.easing);
-            slider.slides.eq(target).fadeIn(vars.animationSpeed, vars.easing, slider.wrapup);
+            //slider.slides.eq(slider.currentSlide).fadeOut(slider.vars.animationSpeed, slider.vars.easing);
+            //slider.slides.eq(target).fadeIn(slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
+            slider.slides.eq(slider.currentSlide).css({"zIndex": 1}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
+            slider.slides.eq(target).css({"zIndex": 2}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+
           } else {
             slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
             slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
-            
-            slider.slides.unbind("webkitTransitionEnd transitionend");
-            slider.slides.eq(slider.currentSlide).bind("webkitTransitionEnd transitionend", function() {
-              // API: after() animation Callback
-              vars.after(slider);
-            });
-            
-            slider.animating = false;
-            slider.currentSlide = slider.animatingTo;
+            slider.wrapup(dimension);
           }
         }
         // SMOOTH HEIGHT:
-        if (vars.smoothHeight) methods.smoothHeight(vars.animationSpeed);
+        if (slider.vars.smoothHeight) methods.smoothHeight(slider.vars.animationSpeed);
       }
-    } 
+    }
     slider.wrapup = function(dimension) {
       // SLIDE:
       if (!fade && !carousel) {
-        if (slider.currentSlide === 0 && slider.animatingTo === slider.last && vars.animationLoop) {
+        if (slider.currentSlide === 0 && slider.animatingTo === slider.last && slider.vars.animationLoop) {
           slider.setProps(dimension, "jumpEnd");
-        } else if (slider.currentSlide === slider.last && slider.animatingTo === 0 && vars.animationLoop) {
+        } else if (slider.currentSlide === slider.last && slider.animatingTo === 0 && slider.vars.animationLoop) {
           slider.setProps(dimension, "jumpStart");
         }
       }
       slider.animating = false;
       slider.currentSlide = slider.animatingTo;
       // API: after() animation Callback
-      vars.after(slider);
+      slider.vars.after(slider);
     }
-    
+
     // SLIDESHOW:
     slider.animateSlides = function() {
-      if (!slider.animating) slider.flexAnimate(slider.getTarget("next"));
+      if (!slider.animating && focused ) slider.flexAnimate(slider.getTarget("next"));
     }
     // SLIDESHOW:
     slider.pause = function() {
       clearInterval(slider.animatedSlides);
+      slider.animatedSlides = null;
       slider.playing = false;
       // PAUSEPLAY:
-      if (vars.pausePlay) methods.pausePlay.update("play");
+      if (slider.vars.pausePlay) methods.pausePlay.update("play");
       // SYNC:
       if (slider.syncExists) methods.sync("pause");
     }
     // SLIDESHOW:
     slider.play = function() {
-      slider.animatedSlides = setInterval(slider.animateSlides, vars.slideshowSpeed);
-      slider.playing = true;
+      if (slider.playing) clearInterval(slider.animatedSlides);
+      slider.animatedSlides = slider.animatedSlides || setInterval(slider.animateSlides, slider.vars.slideshowSpeed);
+      slider.started = slider.playing = true;
       // PAUSEPLAY:
-      if (vars.pausePlay) methods.pausePlay.update("pause");
+      if (slider.vars.pausePlay) methods.pausePlay.update("pause");
       // SYNC:
       if (slider.syncExists) methods.sync("play");
     }
+    // STOP:
+    slider.stop = function () {
+      slider.pause();
+      slider.stopped = true;
+    }
     slider.canAdvance = function(target, fromNav) {
       // ASNAV:
       var last = (asNav) ? slider.pagingCount - 1 : slider.last;
@@ -580,29 +790,29 @@
              (asNav && slider.currentItem === slider.count - 1 && target === 0 && slider.direction === "prev") ? true :
              (asNav && slider.currentItem === 0 && target === slider.pagingCount - 1 && slider.direction !== "next") ? false :
              (target === slider.currentSlide && !asNav) ? false :
-             (vars.animationLoop) ? true :
+             (slider.vars.animationLoop) ? true :
              (slider.atEnd && slider.currentSlide === 0 && target === last && slider.direction !== "next") ? false :
              (slider.atEnd && slider.currentSlide === last && target === 0 && slider.direction === "next") ? false :
              true;
     }
     slider.getTarget = function(dir) {
-      slider.direction = dir; 
+      slider.direction = dir;
       if (dir === "next") {
         return (slider.currentSlide === slider.last) ? 0 : slider.currentSlide + 1;
       } else {
         return (slider.currentSlide === 0) ? slider.last : slider.currentSlide - 1;
       }
     }
-    
+
     // SLIDE:
     slider.setProps = function(pos, special, dur) {
       var target = (function() {
-        var posCheck = (pos) ? pos : ((slider.itemW + vars.itemMargin) * slider.move) * slider.animatingTo,
+        var posCheck = (pos) ? pos : ((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo,
             posCalc = (function() {
               if (carousel) {
                 return (special === "setTouch") ? pos :
                        (reverse && slider.animatingTo === slider.last) ? 0 :
-                       (reverse) ? slider.limit - (((slider.itemW + vars.itemMargin) * slider.move) * slider.animatingTo) :
+                       (reverse) ? slider.limit - (((slider.itemW + slider.vars.itemMargin) * slider.move) * slider.animatingTo) :
                        (slider.animatingTo === slider.last) ? slider.limit : posCheck;
               } else {
                 switch (special) {
@@ -614,6 +824,7 @@
                 }
               }
             }());
+
             return (posCalc * -1) + "px";
           }());
 
@@ -622,16 +833,16 @@
         dur = (dur !== undefined) ? (dur/1000) + "s" : "0s";
         slider.container.css("-" + slider.pfx + "-transition-duration", dur);
       }
-      
+
       slider.args[slider.prop] = target;
       if (slider.transitions || dur === undefined) slider.container.css(slider.args);
     }
-    
+
     slider.setup = function(type) {
       // SLIDE:
       if (!fade) {
         var sliderOffset, arr;
-            
+
         if (type === "init") {
           slider.viewport = $('<div class="' + namespace + 'viewport"></div>').css({"overflow": "hidden", "position": "relative"}).appendTo(slider).append(slider.container);
           // INFINITE LOOP:
@@ -645,15 +856,15 @@
           }
         }
         // INFINITE LOOP && !CAROUSEL:
-        if (vars.animationLoop && !carousel) {
+        if (slider.vars.animationLoop && !carousel) {
           slider.cloneCount = 2;
           slider.cloneOffset = 1;
           // clear out old clones
           if (type !== "init") slider.container.find('.clone').remove();
-          slider.container.append(slider.slides.first().clone().addClass('clone')).prepend(slider.slides.last().clone().addClass('clone'));
+          slider.container.append(slider.slides.first().clone().addClass('clone').attr('aria-hidden', 'true')).prepend(slider.slides.last().clone().addClass('clone').attr('aria-hidden', 'true'));
         }
-        slider.newSlides = $(vars.selector, slider);
-        
+        slider.newSlides = $(slider.vars.selector, slider);
+
         sliderOffset = (reverse) ? slider.count - 1 - slider.currentSlide + slider.cloneOffset : slider.currentSlide + slider.cloneOffset;
         // VERTICAL:
         if (vertical && !carousel) {
@@ -671,50 +882,53 @@
             slider.doMath();
             slider.newSlides.css({"width": slider.computedW, "float": "left", "display": "block"});
             // SMOOTH HEIGHT:
-            if (vars.smoothHeight) methods.smoothHeight();
+            if (slider.vars.smoothHeight) methods.smoothHeight();
           }, (type === "init") ? 100 : 0);
         }
-      } else { // FADE: 
+      } else { // FADE:
         slider.slides.css({"width": "100%", "float": "left", "marginRight": "-100%", "position": "relative"});
         if (type === "init") {
           if (!touch) {
-            slider.slides.eq(slider.currentSlide).fadeIn(vars.animationSpeed, vars.easing);
+            //slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
+            slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).animate({"opacity": 1},slider.vars.animationSpeed,slider.vars.easing);
           } else {
-            slider.slides.css({ "opacity": 0, "display": "block", "webkitTransition": "opacity " + vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2});
+            slider.slides.css({ "opacity": 0, "display": "block", "webkitTransition": "opacity " + slider.vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2});
           }
         }
         // SMOOTH HEIGHT:
-        if (vars.smoothHeight) methods.smoothHeight();
+        if (slider.vars.smoothHeight) methods.smoothHeight();
       }
       // !CAROUSEL:
       // CANDIDATE: active slide
       if (!carousel) slider.slides.removeClass(namespace + "active-slide").eq(slider.currentSlide).addClass(namespace + "active-slide");
     }
-    
+
+
     slider.doMath = function() {
       var slide = slider.slides.first(),
-          slideMargin = vars.itemMargin,
-          minItems = vars.minItems,
-          maxItems = vars.maxItems;
-      
-      slider.w = slider.width();
+          slideMargin = slider.vars.itemMargin,
+          minItems = slider.vars.minItems,
+          maxItems = slider.vars.maxItems;
+
+      slider.w = (slider.viewport===undefined) ? slider.width() : slider.viewport.width();
       slider.h = slide.height();
       slider.boxPadding = slide.outerWidth() - slide.width();
 
       // CAROUSEL:
       if (carousel) {
-        slider.itemT = vars.itemWidth + slideMargin;
+        slider.itemT = slider.vars.itemWidth + slideMargin;
         slider.minW = (minItems) ? minItems * slider.itemT : slider.w;
-        slider.maxW = (maxItems) ? maxItems * slider.itemT : slider.w;
-        slider.itemW = (slider.minW > slider.w) ? (slider.w - (slideMargin * minItems))/minItems :
-                       (slider.maxW < slider.w) ? (slider.w - (slideMargin * maxItems))/maxItems :
-                       (vars.itemWidth > slider.w) ? slider.w : vars.itemWidth;
-        slider.visible = Math.floor(slider.w/(slider.itemW + slideMargin));
-        slider.move = (vars.move > 0 && vars.move < slider.visible ) ? vars.move : slider.visible;
+        slider.maxW = (maxItems) ? (maxItems * slider.itemT) - slideMargin : slider.w;
+        slider.itemW = (slider.minW > slider.w) ? (slider.w - (slideMargin * (minItems - 1)))/minItems :
+                       (slider.maxW < slider.w) ? (slider.w - (slideMargin * (maxItems - 1)))/maxItems :
+                       (slider.vars.itemWidth > slider.w) ? slider.w : slider.vars.itemWidth;
+
+        slider.visible = Math.floor(slider.w/(slider.itemW));
+        slider.move = (slider.vars.move > 0 && slider.vars.move < slider.visible ) ? slider.vars.move : slider.visible;
         slider.pagingCount = Math.ceil(((slider.count - slider.visible)/slider.move) + 1);
         slider.last =  slider.pagingCount - 1;
         slider.limit = (slider.pagingCount === 1) ? 0 :
-                       (vars.itemWidth > slider.w) ? ((slider.itemW + (slideMargin * 2)) * slider.count) - slider.w - slideMargin : ((slider.itemW + slideMargin) * slider.count) - slider.w - slideMargin;
+                       (slider.vars.itemWidth > slider.w) ? (slider.itemW * (slider.count - 1)) + (slideMargin * (slider.count - 1)) : ((slider.itemW + slideMargin) * slider.count) - slider.w - slideMargin;
       } else {
         slider.itemW = slider.w;
         slider.pagingCount = slider.count;
@@ -722,10 +936,11 @@
       }
       slider.computedW = slider.itemW - slider.boxPadding;
     }
-    
+
+
     slider.update = function(pos, action) {
       slider.doMath();
-      
+
       // update currentSlide and slider.animatingTo if necessary
       if (!carousel) {
         if (pos < slider.currentSlide) {
@@ -735,9 +950,9 @@
         }
         slider.animatingTo = slider.currentSlide;
       }
-      
+
       // update controlNav
-      if (vars.controlNav && !slider.manualControls) {
+      if (slider.vars.controlNav && !slider.manualControls) {
         if ((action === "add" && !carousel) || slider.pagingCount > slider.controlNav.length) {
           methods.controlNav.update("add");
         } else if ((action === "remove" && !carousel) || slider.pagingCount < slider.controlNav.length) {
@@ -749,95 +964,104 @@
         }
       }
       // update directionNav
-      if (vars.directionNav) methods.directionNav.update();
-      
+      if (slider.vars.directionNav) methods.directionNav.update();
+
     }
-    
+
     slider.addSlide = function(obj, pos) {
       var $obj = $(obj);
-      
+
       slider.count += 1;
       slider.last = slider.count - 1;
-      
+
       // append new slide
       if (vertical && reverse) {
         (pos !== undefined) ? slider.slides.eq(slider.count - pos).after($obj) : slider.container.prepend($obj);
       } else {
         (pos !== undefined) ? slider.slides.eq(pos).before($obj) : slider.container.append($obj);
       }
-      
+
       // update currentSlide, animatingTo, controlNav, and directionNav
       slider.update(pos, "add");
-      
+
       // update slider.slides
-      slider.slides = $(vars.selector + ':not(.clone)', slider);
+      slider.slides = $(slider.vars.selector + ':not(.clone)', slider);
       // re-setup the slider to accomdate new slide
       slider.setup();
-      
+
       //FlexSlider: added() Callback
-      vars.added(slider);
+      slider.vars.added(slider);
     }
     slider.removeSlide = function(obj) {
       var pos = (isNaN(obj)) ? slider.slides.index($(obj)) : obj;
-      
+
       // update count
       slider.count -= 1;
       slider.last = slider.count - 1;
-      
+
       // remove slide
       if (isNaN(obj)) {
         $(obj, slider.slides).remove();
       } else {
         (vertical && reverse) ? slider.slides.eq(slider.last).remove() : slider.slides.eq(obj).remove();
       }
-      
+
       // update currentSlide, animatingTo, controlNav, and directionNav
       slider.doMath();
       slider.update(pos, "remove");
-      
+
       // update slider.slides
-      slider.slides = $(vars.selector + ':not(.clone)', slider);
+      slider.slides = $(slider.vars.selector + ':not(.clone)', slider);
       // re-setup the slider to accomdate new slide
       slider.setup();
-      
+
       // FlexSlider: removed() Callback
-      vars.removed(slider);
+      slider.vars.removed(slider);
     }
-    
+
     //FlexSlider: Initialize
     methods.init();
   }
-  
+
+  // Ensure the slider isn't focussed if the window loses focus.
+  $( window ).blur( function ( e ) {
+    focused = false;
+  }).focus( function ( e ) {
+    focused = true;
+  });
+
   //FlexSlider: Default Settings
   $.flexslider.defaults = {
     namespace: "flex-",             //{NEW} String: Prefix string attached to the class of every element generated by the plugin
     selector: ".slides > li",       //{NEW} Selector: Must match a simple pattern. '{container} > {slide}' -- Ignore pattern at your own peril
     animation: "fade",              //String: Select your animation type, "fade" or "slide"
-    easing: "swing",               //{NEW} String: Determines the easing method used in jQuery transitions. jQuery easing plugin is supported!
+    easing: "swing",                //{NEW} String: Determines the easing method used in jQuery transitions. jQuery easing plugin is supported!
     direction: "horizontal",        //String: Select the sliding direction, "horizontal" or "vertical"
     reverse: false,                 //{NEW} Boolean: Reverse the animation direction
-    animationLoop: true,             //Boolean: Should the animation loop? If false, directionNav will received "disable" classes at either end
-    smoothHeight: false,            //{NEW} Boolean: Allow height of the slider to animate smoothly in horizontal mode  
+    animationLoop: true,            //Boolean: Should the animation loop? If false, directionNav will received "disable" classes at either end
+    smoothHeight: false,            //{NEW} Boolean: Allow height of the slider to animate smoothly in horizontal mode
     startAt: 0,                     //Integer: The slide that the slider should start on. Array notation (0 = first slide)
     slideshow: true,                //Boolean: Animate slider automatically
     slideshowSpeed: 7000,           //Integer: Set the speed of the slideshow cycling, in milliseconds
     animationSpeed: 600,            //Integer: Set the speed of animations, in milliseconds
     initDelay: 0,                   //{NEW} Integer: Set an initialization delay, in milliseconds
     randomize: false,               //Boolean: Randomize slide order
-    
+    thumbCaptions: false,           //Boolean: Whether or not to put captions on thumbnails when using the "thumbnails" controlNav.
+
     // Usability features
     pauseOnAction: true,            //Boolean: Pause the slideshow when interacting with control elements, highly recommended.
     pauseOnHover: false,            //Boolean: Pause the slideshow when hovering over slider, then resume when no longer hovering
+    pauseInvisible: true,   		//{NEW} Boolean: Pause the slideshow when tab is invisible, resume when visible. Provides better UX, lower CPU usage.
     useCSS: true,                   //{NEW} Boolean: Slider will use CSS3 transitions if available
     touch: true,                    //{NEW} Boolean: Allow touch swipe navigation of the slider on touch-enabled devices
     video: false,                   //{NEW} Boolean: If using video in the slider, will prevent CSS3 3D Transforms to avoid graphical glitches
-    
+
     // Primary Controls
     controlNav: true,               //Boolean: Create navigation for paging control of each clide? Note: Leave true for manualControls usage
     directionNav: true,             //Boolean: Create navigation for previous/next navigation? (true/false)
     prevText: "Previous",           //String: Set the text for the "previous" directionNav item
     nextText: "Next",               //String: Set the text for the "next" directionNav item
-    
+
     // Secondary Navigation
     keyboard: true,                 //Boolean: Allow slider navigating via keyboard left/right keys
     multipleKeyboard: false,        //{NEW} Boolean: Allow keyboard navigation to affect multiple sliders. Default behavior cuts out keyboard navigation with more than one slider present.
@@ -845,20 +1069,21 @@
     pausePlay: false,               //Boolean: Create pause/play dynamic element
     pauseText: "Pause",             //String: Set the text for the "pause" pausePlay item
     playText: "Play",               //String: Set the text for the "play" pausePlay item
-    
+
     // Special properties
     controlsContainer: "",          //{UPDATED} jQuery Object/Selector: Declare which container the navigation elements should be appended too. Default container is the FlexSlider element. Example use would be $(".flexslider-container"). Property is ignored if given element is not found.
     manualControls: "",             //{UPDATED} jQuery Object/Selector: Declare custom control navigation. Examples would be $(".flex-control-nav li") or "#tabs-nav li img", etc. The number of elements in your controlNav should match the number of slides/tabs.
     sync: "",                       //{NEW} Selector: Mirror the actions performed on this slider with another slider. Use with care.
     asNavFor: "",                   //{NEW} Selector: Internal property exposed for turning the slider into a thumbnail navigation for another slider
-    
+
     // Carousel Options
     itemWidth: 0,                   //{NEW} Integer: Box-model width of individual carousel items, including horizontal borders and padding.
     itemMargin: 0,                  //{NEW} Integer: Margin between carousel items.
-    minItems: 0,                    //{NEW} Integer: Minimum number of carousel items that should be visible. Items will resize fluidly when below this.
+    minItems: 1,                    //{NEW} Integer: Minimum number of carousel items that should be visible. Items will resize fluidly when below this.
     maxItems: 0,                    //{NEW} Integer: Maxmimum number of carousel items that should be visible. Items will resize fluidly when above this limit.
     move: 0,                        //{NEW} Integer: Number of carousel items that should move on animation. If 0, slider will move all visible items.
-                                    
+    allowOneSlide: true,           //{NEW} Boolean: Whether or not to allow a slider comprised of a single slide
+
     // Callback API
     start: function(){},            //Callback: function(slider) - Fires when the slider loads the first slide
     before: function(){},           //Callback: function(slider) - Fires asynchronously with each slider animation
@@ -872,17 +1097,17 @@
   //FlexSlider: Plugin Function
   $.fn.flexslider = function(options) {
     if (options === undefined) options = {};
-    
+
     if (typeof options === "object") {
       return this.each(function() {
         var $this = $(this),
             selector = (options.selector) ? options.selector : ".slides > li",
             $slides = $this.find(selector);
 
-        if ($slides.length === 1) {
+      if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
           $slides.fadeIn(400);
           if (options.start) options.start($this);
-        } else if ($this.data('flexslider') == undefined) {
+        } else if ($this.data('flexslider') === undefined) {
           new $.flexslider(this, options);
         }
       });
@@ -892,12 +1117,12 @@
       switch (options) {
         case "play": $slider.play(); break;
         case "pause": $slider.pause(); break;
+        case "stop": $slider.stop(); break;
         case "next": $slider.flexAnimate($slider.getTarget("next"), true); break;
         case "prev":
         case "previous": $slider.flexAnimate($slider.getTarget("prev"), true); break;
         default: if (typeof options === "number") $slider.flexAnimate(options, true);
       }
     }
-  }  
-
-})(jQuery);
+  }
+})(jQuery);