fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #383 in FUI/fineui from ~WINDY/fui:master to master 

* commit 'aaa76c1e96027d63821c57ed681c08e6ea409573':
  BI-20011
es6
guy 6 years ago
parent
565072e987 aaa76c1e96
commit
c24f6ea79c
7 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/_fineui.min.js
  2. 6
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 6
      dist/fineui.js
  5. 2
      dist/fineui.min.js
  6. 6
      dist/widget.js
  7. 6
      src/widget/dynamicdate/dynamicdate.card.js

2
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored
Unescape View File

@ -90376,8 +90376,8 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
};
});
if(values.length === 1 && values[0] === BI.DynamicDateCard.TYPE.DAY) {
items.push = [{
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
@ -90389,7 +90389,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
self.fireEvent("EVENT_CHANGE");
}
}]
}];
});
}else{
if(values.length !== 0 && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.DAY && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.WORK_DAY) {
items.push({

2
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/fineui.js vendored
Unescape View File

@ -90619,8 +90619,8 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
};
});
if(values.length === 1 && values[0] === BI.DynamicDateCard.TYPE.DAY) {
items.push = [{
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
@ -90632,7 +90632,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
self.fireEvent("EVENT_CHANGE");
}
}]
}];
});
}else{
if(values.length !== 0 && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.DAY && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.WORK_DAY) {
items.push({

2
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored
Unescape View File

@ -2909,8 +2909,8 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
};
});
if(values.length === 1 && values[0] === BI.DynamicDateCard.TYPE.DAY) {
items.push = [{
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
@ -2922,7 +2922,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
self.fireEvent("EVENT_CHANGE");
}
}]
}];
});
}else{
if(values.length !== 0 && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.DAY && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.WORK_DAY) {
items.push({

6
src/widget/dynamicdate/dynamicdate.card.js
Unescape View File

@ -143,8 +143,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
};
});
if(values.length === 1 && values[0] === BI.DynamicDateCard.TYPE.DAY) {
items.push = [{
if(values.length === 1 && values[0].dateType === BI.DynamicDateCard.TYPE.DAY) {
items.push({
type: "bi.text_value_combo",
height: 24,
items: this._getText(BI.DynamicDateCard.TYPE.MONTH),
@ -156,7 +156,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
self.fireEvent("EVENT_CHANGE");
}
}]
}];
});
}else{
if(values.length !== 0 && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.DAY && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.WORK_DAY) {
items.push({

Write Preview
Loading…
Cancel
Save