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
windy 6 years ago
parent
commit
85804de500
  1. 2
      dist/base.js
  2. 2
      dist/bundle.ie.js
  3. 2
      dist/bundle.js
  4. 25
      dist/demo.js
  5. 2
      dist/fineui.ie.js
  6. 2
      dist/fineui.js
  7. 2
      src/base/single/input/file.js

2
dist/base.js vendored

@ -9629,7 +9629,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

2
dist/bundle.ie.js vendored

@ -44696,7 +44696,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

2
dist/bundle.js vendored

@ -45100,7 +45100,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

25
dist/demo.js vendored

@ -6126,30 +6126,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
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);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

2
dist/fineui.ie.js vendored

@ -44938,7 +44938,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

2
dist/fineui.js vendored

@ -45342,7 +45342,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

2
src/base/single/input/file.js

@ -513,7 +513,7 @@
// BI.Msg.toast(value);
}
}
self.fireEvent(BI.File.EVENT_CHANGE, {
wrap.files.length > 0 && self.fireEvent(BI.File.EVENT_CHANGE, {
files: wrap.files
});
input.value = "";

Loading…
Cancel
Save