Skip to content

Commit 367dfe7

Browse files
authored
Merge pull request ksky521#150 from daviscai/master
fixed ksky521#148 magic多个子页面列表动效失效bug
2 parents 1a664a3 + feaff81 commit 367dfe7

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

assets/js/nodeppt.js

+29-2
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,21 @@
12231223
$cur.dataset.status = 'wait';
12241224
return;
12251225
} else {
1226-
e.stop();
1226+
//e.stop();
1227+
//fixed #148 magic多个子页面列表动效失效bug
1228+
var $willgoneSlide = $slides[index + 1];
1229+
var buildItems = toArray($('.building', $willgoneSlide));
1230+
var buildedItems = toArray($('.builded', $willgoneSlide));
1231+
if (buildItems.length > 0 || buildedItems.length > 0) {
1232+
var willgoneSlideEvent = dispatchEvent($willgoneSlide, 'Build', {
1233+
direction: 'prev',
1234+
container: $willgoneSlide
1235+
});
1236+
willgoneSlideEvent.stop();
1237+
return;
1238+
} else {
1239+
e.stop();
1240+
}
12271241
}
12281242
} else {
12291243
index++;
@@ -1234,7 +1248,20 @@
12341248
$cur.dataset.status = 'done';
12351249
return;
12361250
} else {
1237-
e.stop();
1251+
//e.stop();
1252+
//fixed #148 magic多个子页面列表动效失效bug
1253+
var $willgoneSlide = $slides[index-1];
1254+
var toBuildItems = toArray($('.tobuild', $willgoneSlide));
1255+
if(toBuildItems.length>0){
1256+
var willgoneSlideEvent = dispatchEvent($willgoneSlide, 'Build', {
1257+
direction: 'next',
1258+
container: $willgoneSlide
1259+
});
1260+
willgoneSlideEvent.stop();
1261+
return;
1262+
}else{
1263+
e.stop();
1264+
}
12381265
}
12391266
}
12401267
$cur.dataset.index = index;

0 commit comments

Comments
 (0)