Skip to content

Commit 81294b0

Browse files
committed
Merge pull request #23 from SevenHDU/master
修复lucky应用中的bug。
2 parents 6a8371a + 2dea0f2 commit 81294b0

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

sea-modules/examples/lucky/1.0.0/main-debug.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ define("examples/lucky/1.0.0/lucky-debug", [ "jquery-debug", "jquery-easing-debu
5858
for (var i = 0; i < that.users.length; i++) {
5959
var user = that.users[i];
6060
if (user.name === name) {
61-
that.moveLucky();
62-
if (that.luckyUser !== user) {
61+
if (!that.moveLucky() && that.luckyUser !== user) {
6362
that.setLucky(user);
6463
}
6564
break;
@@ -115,6 +114,9 @@ define("examples/lucky/1.0.0/lucky-debug", [ "jquery-debug", "jquery-easing-debu
115114
luckyUser.el.prependTo("#lucky-balls");
116115
this.removeItem(luckyUser);
117116
this.luckyUser = null;
117+
return true;
118+
} else {
119+
return false;
118120
}
119121
},
120122
setLucky: function(item) {

sea-modules/examples/lucky/1.0.0/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/lucky/dist/main-debug.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ define("examples/lucky/1.0.0/lucky-debug", [ "jquery-debug", "jquery-easing-debu
5858
for (var i = 0; i < that.users.length; i++) {
5959
var user = that.users[i];
6060
if (user.name === name) {
61-
that.moveLucky();
62-
if (that.luckyUser !== user) {
61+
if (!that.moveLucky() && that.luckyUser !== user) {
6362
that.setLucky(user);
6463
}
6564
break;
@@ -115,6 +114,9 @@ define("examples/lucky/1.0.0/lucky-debug", [ "jquery-debug", "jquery-easing-debu
115114
luckyUser.el.prependTo("#lucky-balls");
116115
this.removeItem(luckyUser);
117116
this.luckyUser = null;
117+
return true;
118+
} else {
119+
return false;
118120
}
119121
},
120122
setLucky: function(item) {

0 commit comments

Comments
 (0)