Browse Source

Merge pull request #805 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '982104a5f6035f09f788b129852d23eb7190f46a':
  BI-37817 年周数计算与firefox
es6
windy 6 years ago
parent
commit
1509c4c9df
  1. 12
      dist/bundle.ie.js
  2. 42
      dist/bundle.ie.min.js
  3. 12
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 48
      dist/bundle.min.js
  6. 12
      dist/core.js
  7. 25
      dist/demo.js
  8. 12
      dist/fineui.ie.js
  9. 40
      dist/fineui.ie.min.js
  10. 12
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 47
      dist/fineui.min.js
  13. 12
      dist/fineui_without_jquery_polyfill.js
  14. 12
      dist/utils.js
  15. 4
      dist/utils.min.js
  16. 12
      src/core/func/date.js

12
dist/bundle.ie.js vendored

@ -18023,11 +18023,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

42
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/bundle.js vendored

@ -18023,11 +18023,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

48
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/core.js vendored

@ -18023,11 +18023,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -18049,6 +18045,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

25
dist/demo.js vendored

@ -6158,7 +6158,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

12
dist/fineui.ie.js vendored

@ -18268,11 +18268,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -18294,6 +18290,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

40
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/fineui.js vendored

@ -18268,11 +18268,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -18294,6 +18290,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

47
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/fineui_without_jquery_polyfill.js vendored

@ -17769,11 +17769,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -17795,6 +17791,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

12
dist/utils.js vendored

@ -10784,11 +10784,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -10810,6 +10806,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

12
src/core/func/date.js

@ -202,11 +202,7 @@ _.extend(BI, {
} }
return /Konqueror|Safari|KHTML/i.test(navigator.userAgent); return /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
}; };
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
// 包含年周的格式化,ISO8601标准周的计数会影响年 // 包含年周的格式化,ISO8601标准周的计数会影响年
if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) { if ((str.indexOf("%Y") !== -1 || str.indexOf("%y") !== -1) && (str.indexOf("%W") !== -1 || str.indexOf("%U") !== -1 || str.indexOf("%V") !== -1)) {
switch (wn) { switch (wn) {
@ -228,6 +224,12 @@ _.extend(BI, {
break; break;
} }
} }
if (!BI.isKhtml()) {
return str.replace(re, function (par) {
return s[par] || par;
});
}
var a = str.match(re); var a = str.match(re);
for (var i = 0; i < a.length; i++) { for (var i = 0; i < a.length; i++) {
var tmp = s[a[i]]; var tmp = s[a[i]];

Loading…
Cancel
Save