Commit a6a5a5df authored by hbcui1984's avatar hbcui1984

升级至0.5.7

parent 695328ee
/*! /*!
* ===================================================== * =====================================================
* Mui v0.5.6 (https://github.com/dcloudio/mui) * Mui v0.5.7 (https://github.com/dcloudio/mui)
* ===================================================== * =====================================================
*/ */
...@@ -1563,7 +1563,7 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -1563,7 +1563,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
} }
.mui-grid-view.mui-grid-9 .mui-table-view-cell { .mui-grid-view.mui-grid-9 .mui-table-view-cell {
padding: 11px 15px; padding: 11px 15px;
margin: 0; margin: -1px 0 0 -1px;
vertical-align: top; vertical-align: top;
border-top: 1px solid #eee; border-top: 1px solid #eee;
border-left: 1px solid #eee; border-left: 1px solid #eee;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/*! /*!
* ===================================================== * =====================================================
* Mui v0.5.6 (https://github.com/dcloudio/mui) * Mui v0.5.7 (https://github.com/dcloudio/mui)
* ===================================================== * =====================================================
*/ */
/** /**
...@@ -1543,7 +1543,7 @@ window.mui = mui; ...@@ -1543,7 +1543,7 @@ window.mui = mui;
}; };
PullRefresh.prototype.initPocket = function() { PullRefresh.prototype.initPocket = function() {
var options = this.options; var options = this.options;
if (options.down && options.down.hasOwnProperty('callback')) { if (options.down && options.down.hasOwnProperty('callback')&&!($.os.plus&&$.os.android)) {
this.topPocket = this.element.querySelector('.' + CLASS_PULL_TOP_POCKET); this.topPocket = this.element.querySelector('.' + CLASS_PULL_TOP_POCKET);
if (!this.topPocket) { if (!this.topPocket) {
this.topPocket = this.createPocket(CLASS_PULL_TOP_POCKET, options.down); this.topPocket = this.createPocket(CLASS_PULL_TOP_POCKET, options.down);
......
This diff is collapsed.
/*! /*!
* ===================================================== * =====================================================
* Mui v0.5.6 (https://github.com/dcloudio/mui) * Mui v0.5.7 (https://github.com/dcloudio/mui)
* ===================================================== * =====================================================
*/ */
/*! /*!
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -68,17 +68,17 @@ ...@@ -68,17 +68,17 @@
wo.evalJS("pullReset()"); wo.evalJS("pullReset()");
}, 1000); }, 1000);
} }
mui.init({ // mui.init({
swipeBack: false, // swipeBack: false,
optimize: false, // optimize: false,
pullRefresh: { // pullRefresh: {
container: '.mui-content-padded', // container: '.mui-content-padded',
up: { // up: {
contentrefresh: '正在加载...', // contentrefresh: '正在加载...',
callback: pullupRefresh // callback: pullupRefresh
} // }
} // }
}); // });
/** /**
* 上拉加载具体业务实现 * 上拉加载具体业务实现
*/ */
......
...@@ -107,15 +107,14 @@ ...@@ -107,15 +107,14 @@
<script> <script>
mui.init({ mui.init({
swipeBack:false, swipeBack:false,
optimize: false,
pullRefresh: { pullRefresh: {
container: '.mui-content-padded', container: '.mui-content-padded',
down: { down: {
callback:pulldownRefresh callback:pulldownRefresh
}, },
up: { up: {
contentrefresh: '正在加载...', contentrefresh: '正在加载...',
callback: pullupRefresh callback: pullupRefresh
} }
} }
}); });
......
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
</div> </div>
<div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled"> <div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled">
<span class="mui-icon mui-icon-phone"></span> <span class="mui-icon mui-icon-phone"></span>
<span class="mui-icon mui-icon-sms"></span> <span class="mui-icon mui-icon-email"></span>
<span class="mui-icon mui-icon-chat"></span> <span class="mui-icon mui-icon-chat"></span>
</div> </div>
</div> </div>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</div> </div>
<div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled"> <div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled">
<span class="mui-icon mui-icon-phone"></span> <span class="mui-icon mui-icon-phone"></span>
<span class="mui-icon mui-icon-sms"></span> <span class="mui-icon mui-icon-email"></span>
<span class="mui-icon mui-icon-chat"></span> <span class="mui-icon mui-icon-chat"></span>
</div> </div>
</div> </div>
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
</div> </div>
<div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled"> <div class="mui-slider-handle oa-contact-action mui-table-cell mui-disabled">
<span class="mui-icon mui-icon-phone"></span> <span class="mui-icon mui-icon-phone"></span>
<span class="mui-icon mui-icon-sms"></span> <span class="mui-icon mui-icon-email"></span>
<span class="mui-icon mui-icon-chat"></span> <span class="mui-icon mui-icon-chat"></span>
</div> </div>
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
</ul> </ul>
</div> </div>
<script> <script>
var limit = 3,count = 0; var limit = 5,count = 0;
mui.init({ mui.init({
preloadLimit: limit, //同时并存的预加载窗口数量 preloadLimit: limit, //同时并存的预加载窗口数量
swipeBack: false, swipeBack: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment