Merge branch 'hookszhang-master'

JaneSu · Apr 22, 2016 · 9a56c68 · 9a56c68
2 parents 6abebde + 20c06b6
commit 9a56c68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/demo/animate.html b/demo/animate.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">    
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>使用animate.css</title>
     <link rel="stylesheet" href="css/global.css">
     <link rel="stylesheet" href="../src/zepto.fullpage.css">
@@ -33,7 +33,7 @@
         $('.wp-inner').fullpage({
             change: function (e) {
                 // 移除动画属性
-                $('.js-animate').each(function() {
+                $('.page').eq(e.cur).find('.js-animate').each(function() {
                     $(this).removeClass($(this).data('animate')).hide();
                 });
             },

diff --git a/demo/animations.html b/demo/animations.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">    
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>使用animattions.css</title>
     <link rel="stylesheet" href="css/global.css">
     <link rel="stylesheet" href="../src/zepto.fullpage.css">
@@ -33,7 +33,7 @@
         $('.wp-inner').fullpage({
             change: function (e) {
                 // 移除动画属性
-                $('.js-animate').each(function() {
+                $('.page').eq(e.cur).find('.js-animate').each(function() {
                     $(this).removeClass($(this).data('animate')).hide();
                 });
             },

diff --git a/demo_js/animate.html b/demo_js/animate.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">    
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>使用animate.css</title>
     <link rel="stylesheet" href="css/global.css">
     <link rel="stylesheet" href="../src/zepto.fullpage.css">
@@ -38,7 +38,7 @@
         document.getElementsByClassName('wp-inner')[0].fullpage({
             change: function (e) {
                 // 移除动画属性
-                forEach.call(document.querySelectorAll('.js-animate'), function (v) {
+                forEach.call(document.querySelectorAll('.page')[e.cur].querySelectorAll('.js-animate'), function (v) {
                     v.classList.remove(v.dataset['animate']);
                     v.classList.add('hide');
                 });

diff --git a/demo_js/animations.html b/demo_js/animations.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">    
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>使用animations.css</title>
     <link rel="stylesheet" href="css/global.css">
     <link rel="stylesheet" href="../src/zepto.fullpage.css">
@@ -38,7 +38,7 @@
         document.getElementsByClassName('wp-inner')[0].fullpage({
             change: function (e) {
                 // 移除动画属性
-                forEach.call(document.querySelectorAll('.js-animate'), function (v) {
+                forEach.call(document.querySelectorAll('.page')[e.cur].querySelectorAll('.js-animate'), function (v) {
                     v.classList.remove(v.dataset['animate']);
                     v.classList.add('hide');
                 });