Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
MrErHu 6 years ago
parent
commit
de4d523292
  1. 4
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 4
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 4
      dist/fineui.ie.js
  6. 6
      dist/fineui.ie.min.js
  7. 4
      dist/fineui.js
  8. 4
      dist/fineui.min.js
  9. 4
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 4
      dist/widget.js
  12. 21
      src/css/base/single/button/switch.css

4
dist/bundle.ie.js vendored

@ -61773,7 +61773,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -62776,7 +62776,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -62324,7 +62324,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -63327,7 +63327,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.js vendored

@ -62015,7 +62015,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -63018,7 +63018,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -62566,7 +62566,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -63569,7 +63569,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored

@ -45450,7 +45450,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -46453,7 +46453,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -3650,7 +3650,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e"); var dateStr = BI.print(date, "%Y-%X-%e");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },
@ -4653,7 +4653,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
}, },
_setInnerValue: function (date) { _setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S"); var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
this.editor.setState(dateStr); this.editor.setState(dateStr);
this.editor.setValue(dateStr); this.editor.setValue(dateStr);
}, },

21
src/css/base/single/button/switch.css

@ -2,7 +2,7 @@
-webkit-border-radius: 40px 40px 40px 40px; -webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px; -moz-border-radius: 40px 40px 40px 40px;
border-radius: 40px 40px 40px 40px; border-radius: 40px 40px 40px 40px;
background-color: #d4dadd; background-color: #d0d4da;
} }
.bi-switch:active, .bi-switch:active,
.bi-switch.active { .bi-switch.active {
@ -13,3 +13,22 @@
-moz-border-radius: 9px 9px 9px 9px; -moz-border-radius: 9px 9px 9px 9px;
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled {
background-color: #F2F4F7;
}
.bi-switch.disabled:active {
background-color: #F2F4F7;
}
.bi-theme-dark .bi-switch {
background-color: #606479;
}
.bi-theme-dark .bi-switch:active,
.bi-theme-dark .bi-switch.active {
background-color: #3685f2;
}
.bi-theme-dark .bi-switch.disabled {
background-color: #2F3149;
}
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}

Loading…
Cancel
Save