Skip to content

Commit

Permalink
v2.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
百小僧 committed Sep 22, 2018
1 parent 0719bb0 commit 6fff63d
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ gzip压缩版仅 `13.5kb`,非常小巧。

- `原创作者`:百小僧
- `开源协议`:MIT
- `当前版本`:v2.5.1
- `发布日期`:2018.09.21
- `当前版本`:v2.5.2
- `发布日期`:2018.09.22
- `交流Q群`[18863883](//shang.qq.com/wpa/qunwpa?idkey=60a832c9b6d9e7e56a0057fa341270fe52472e8390f9a8ec5985e47c319a166e)
- `版权所有`:百签软件(中山)有限公司

Expand Down
8 changes: 5 additions & 3 deletions doc/doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ window.onload = function () {
<ul>
<li><label>原创作者</label>:百小僧</li>
<li><label>开源协议</label>:MIT</li>
<li><label>当前版本</label>:<strong>v2.5.1</strong></li>
<li><label>发布日期</label>:2018.09.21</li>
<li><label>当前版本</label>:<strong>v2.5.2</strong></li>
<li><label>发布日期</label>:2018.09.22</li>
<li><label>交流Q群</label>:<a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=60a832c9b6d9e7e56a0057fa341270fe52472e8390f9a8ec5985e47c319a166e">18863883</a></li>
<li><label>版权所有</label>:百签软件(中山)有限公司</li>
</ul>
Expand Down Expand Up @@ -268,8 +268,9 @@ window.onload = function () {
layx.destroyInlay("float-log");
layx.html('log', 'Layx 更新日志 v' + layx.v, layx.multiLine(function () {/*
<div style="padding:0 10px 10px 10px">
<h3># 2018.09.21 v2.5.1 发布</h3>
<h3># 2018.09.22 v2.5.2 发布</h3>
<pre style="margin-top:0">
- [修复] useFrameTitle:true bug,感谢 <a href="https://github.com/MonkSoul/Layx/pull/7" target="_blank">#7</a>
- [修复] 窗口百分比居中bug,感谢 QQ:1034937343
</pre>
<h3># 2018.09.17 v2.5.0 发布</h3>
Expand Down Expand Up @@ -577,6 +578,7 @@ window.onload = function () {
var winform = layx.html('float-log', 'Layx v' + layx.v + " 更新日志", layx.multiLine(function () {/*
<div style="padding:10px">
<pre style="margin-top:0;margin-bottom: 0;">
- [修复] useFrameTitle:true bug,感谢 <a href="https://github.com/MonkSoul/Layx/pull/7" target="_blank">#7</a>
- [修复] 窗口百分比居中bug,感谢 QQ:1034937343
</pre>
*/ }), {
Expand Down
2 changes: 1 addition & 1 deletion doc/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1,minimum-scale=1,user-scalable=no" />
<meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge,chrome=1">
<title>Layx 企业级弹窗组件 v2.5.1</title>
<title>Layx 企业级弹窗组件 v2.5.2</title>
<style>
html,
body {
Expand Down
4 changes: 2 additions & 2 deletions layx.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* gitee : https://gitee.com/monksoul/LayX
* github : https://github.com/MonkSoul/Layx/
* author : 百小僧/MonkSoul
* version : v2.5.1
* version : v2.5.2
* create time : 2018.05.11
* update time : 2018.09.21
* update time : 2018.09.22
*/

*[class^="layx-"] {
Expand Down
8 changes: 4 additions & 4 deletions layx.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* gitee : https://gitee.com/monksoul/LayX
* github : https://github.com/MonkSoul/Layx/
* author : 百小僧/MonkSoul
* version : v2.5.1
* version : v2.5.2
* create time : 2018.05.11
* update time : 2018.09.21
* update time : 2018.09.22
*/
;
!(function (over, win, slf) {
var Layx = {
version: '2.5.1',
version: '2.5.2',
defaults: {
id: '',
icon: true,
Expand Down Expand Up @@ -1129,6 +1129,7 @@
iframe.setAttribute("data-focus", "true");
}
}
var iframeTitle = config.title;
if (type === "group") {
if (frameConfig.useFrameTitle === true) {
iframeTitle = iframe.contentWindow.document.querySelector("title").innerText;
Expand Down Expand Up @@ -1230,7 +1231,6 @@
iframe.setAttribute("mozallowfullscreen", "");
iframe.setAttribute("webkitallowfullscreen", "");
iframe.src = isLoad !== false ? ((type === "group" ? frameConfig.url : config.url) || 'about:blank') : 'about:blank';
var iframeTitle = config.title;
if (iframe.attachEvent) {
iframe.attachEvent("onreadystatechange", function () {
if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
Expand Down
Loading

0 comments on commit 6fff63d

Please sign in to comment.