fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
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
34927c6167 ae702d194c
commit
1019f33b1a
7 changed files with 62 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      dist/base.js
  2. 12
      dist/bundle.ie.js
  3. 12
      dist/bundle.js
  4. 12
      dist/fineui.ie.js
  5. 12
      dist/fineui.js
  6. 12
      dist/fineui_without_jquery_polyfill.js
  7. 9
      src/base/single/input/input.js

12
dist/base.js vendored
Unescape View File

@ -9765,6 +9765,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -9786,20 +9787,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -10043,7 +10048,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/bundle.ie.js vendored
Unescape View File

@ -44659,6 +44659,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -44680,20 +44681,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -44937,7 +44942,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/bundle.js vendored
Unescape View File

@ -45198,6 +45198,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -45219,20 +45220,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45476,7 +45481,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/fineui.ie.js vendored
Unescape View File

@ -44901,6 +44901,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -44922,20 +44923,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45179,7 +45184,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/fineui.js vendored
Unescape View File

@ -45440,6 +45440,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -45461,20 +45462,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -45718,7 +45723,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

12
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32491,6 +32491,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -32512,20 +32513,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {
@ -32769,7 +32774,8 @@ BI.Input.EVENT_VALID = "EVENT_VALID";
BI.Input.EVENT_ERROR = "EVENT_ERROR"; BI.Input.EVENT_ERROR = "EVENT_ERROR";
BI.Input.EVENT_ENTER = "EVENT_ENTER"; BI.Input.EVENT_ENTER = "EVENT_ENTER";
BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Input.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.shortcut("bi.input", BI.Input);/** BI.shortcut("bi.input", BI.Input);
/**
* guy * guy
* @extends BI.Single * @extends BI.Single
* @type {*|void|Object} * @type {*|void|Object}

9
src/base/single/input/input.js
Unescape View File

@ -20,6 +20,7 @@ BI.Input = BI.inherit(BI.Single, {
BI.Input.superclass._init.apply(this, arguments); BI.Input.superclass._init.apply(this, arguments);
var self = this; var self = this;
var ctrlKey = false; var ctrlKey = false;
var keyCode = null;
var inputEventValid = false; var inputEventValid = false;
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
@ -41,20 +42,24 @@ BI.Input = BI.inherit(BI.Single, {
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey;
keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })
.keyup(function (e) { .keyup(function (e) {
keyCode = null;
if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) { if (!(inputEventValid && e.keyCode === BI.KeyCode.ENTER)) {
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(e.keyCode);
} }
}) })
.on("input propertychange", function (e) { .on("input propertychange", function (e) {
// 输入内容全选并直接删光，如果按键没放开就失去焦点不会触发keyup，被focusout覆盖了
// 这个事件在input的属性发生改变的时候就会触发（class的变化也算） // 这个事件在input的属性发生改变的时候就会触发（class的变化也算）
if (BI.isNotNull(e.keyCode)) { if (BI.isNotNull(keyCode)) {
keyCode = null;
inputEventValid = true; inputEventValid = true;
self._keydown_ = true; self._keydown_ = true;
_keydown(e.keyCode); _keydown(keyCode);
} }
}) })
.click(function (e) { .click(function (e) {

Write Preview
Loading…
Cancel
Save