Skip to content

Commit 0d2b337

Browse files
committed
1.5.1
1 parent 3516eab commit 0d2b337

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "cardkit",
33
"description": "",
4-
"version": "1.5.0",
4+
"version": "1.5.1",
55
"dependencies": {
66
},
77
"devDependencies": {

dist/js/main.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -7822,7 +7822,7 @@ define("../cardkit/app", [
78227822
'.ck-modal-button, .ck-modal-button *': function(){
78237823
var me = $(this);
78247824
if (!me.hasClass('ck-modal-button')) {
7825-
me = me.closest('.ck-modal-button');
7825+
me = me.closest('.ck-modal-button');
78267826
}
78277827
ck.openModal(me.data());
78287828
},
@@ -8323,24 +8323,24 @@ define("../cardkit/app", [
83238323

83248324
}
83258325

8326-
if (supports.CARD_SCROLL) {
8326+
//if (supports.CARD_SCROLL) {
83278327

8328-
doc.bind('scroll', function(){
8329-
if (modalCard.isOpened) {
8330-
var y = window.scrollY;
8331-
if (!y && window.innerHeight >= ck.windowFullHeight) {
8332-
return;
8333-
}
8334-
//ck.hideAddressbar();
8335-
ck.resetWindowTop();
8336-
body.scrollTop = 0;
8337-
if (y > 40) {
8338-
ck.viewport[0].scrollTop = ck.viewport[0].scrollTop + y - 40;
8339-
}
8340-
}
8341-
});
8328+
//doc.bind('scroll', function(){
8329+
//if (modalCard.isOpened) {
8330+
//var y = window.scrollY;
8331+
//if (!y && window.innerHeight >= ck.windowFullHeight) {
8332+
//return;
8333+
//}
8334+
////ck.hideAddressbar();
8335+
//ck.resetWindowTop();
8336+
//body.scrollTop = 0;
8337+
//if (y > 40) {
8338+
//ck.viewport[0].scrollTop = ck.viewport[0].scrollTop + y - 40;
8339+
//}
8340+
//}
8341+
//});
83428342

8343-
}
8343+
//}
83448344

83458345
if (supports.CARD_SCROLL
83468346
&& !supports.FULLSCREEN_MODE) {

dist/js/main.min.js

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

examples/static/js/main.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -7822,7 +7822,7 @@ define("../cardkit/app", [
78227822
'.ck-modal-button, .ck-modal-button *': function(){
78237823
var me = $(this);
78247824
if (!me.hasClass('ck-modal-button')) {
7825-
me = me.closest('.ck-modal-button');
7825+
me = me.closest('.ck-modal-button');
78267826
}
78277827
ck.openModal(me.data());
78287828
},
@@ -8323,24 +8323,24 @@ define("../cardkit/app", [
83238323

83248324
}
83258325

8326-
if (supports.CARD_SCROLL) {
8326+
//if (supports.CARD_SCROLL) {
83278327

8328-
doc.bind('scroll', function(){
8329-
if (modalCard.isOpened) {
8330-
var y = window.scrollY;
8331-
if (!y && window.innerHeight >= ck.windowFullHeight) {
8332-
return;
8333-
}
8334-
//ck.hideAddressbar();
8335-
ck.resetWindowTop();
8336-
body.scrollTop = 0;
8337-
if (y > 40) {
8338-
ck.viewport[0].scrollTop = ck.viewport[0].scrollTop + y - 40;
8339-
}
8340-
}
8341-
});
8328+
//doc.bind('scroll', function(){
8329+
//if (modalCard.isOpened) {
8330+
//var y = window.scrollY;
8331+
//if (!y && window.innerHeight >= ck.windowFullHeight) {
8332+
//return;
8333+
//}
8334+
////ck.hideAddressbar();
8335+
//ck.resetWindowTop();
8336+
//body.scrollTop = 0;
8337+
//if (y > 40) {
8338+
//ck.viewport[0].scrollTop = ck.viewport[0].scrollTop + y - 40;
8339+
//}
8340+
//}
8341+
//});
83428342

8343-
}
8343+
//}
83448344

83458345
if (supports.CARD_SCROLL
83468346
&& !supports.FULLSCREEN_MODE) {

examples/static/js/main.min.js

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

0 commit comments

Comments
 (0)