Browse Source

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

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
windy 7 years ago
parent
commit
a80ac1083b
  1. 1
      dist/bundle.js
  2. 1
      dist/fineui.js
  3. 1
      dist/widget.js
  4. 1
      src/widget/dynamicdate/dynamicdate.caculate.js

1
dist/bundle.js vendored

@ -90277,6 +90277,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
if (BI.isNotNull(obj.year)) {
return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
}
return date;
}
});
})();BI.DynamicDateCard = BI.inherit(BI.Widget, {

1
dist/fineui.js vendored

@ -90520,6 +90520,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
if (BI.isNotNull(obj.year)) {
return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
}
return date;
}
});
})();BI.DynamicDateCard = BI.inherit(BI.Widget, {

1
dist/widget.js vendored

@ -2762,6 +2762,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
if (BI.isNotNull(obj.year)) {
return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
}
return date;
}
});
})();BI.DynamicDateCard = BI.inherit(BI.Widget, {

1
src/widget/dynamicdate/dynamicdate.caculate.js

@ -48,6 +48,7 @@
if (BI.isNotNull(obj.year)) {
return obj.position === BI.DynamicDateCard.OFFSET.BEGIN ? BI.getDate(date.getFullYear(), 0, 1) : BI.getDate(date.getFullYear(), 11, 31);
}
return date;
}
});
})();
Loading…
Cancel
Save