Browse Source

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

# Conflicts:
#	dist/2.0/fineui.ie.js
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.js
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.js
#	dist/bundle.ie.min.js
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/core.js
#	dist/fineui.ie.js
#	dist/fineui.ie.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/fineui_without_jquery_polyfill.js
#	dist/utils.min.js
#	src/core/shortcut.js
master
windy 6 years ago
parent
commit
54ef35cc92
  1. 2
      dist/2.0/fineui.ie.js
  2. 2
      dist/2.0/fineui.js
  3. 2
      dist/bundle.ie.js
  4. 2
      dist/bundle.js
  5. 2
      dist/core.js
  6. 2
      dist/fineui.ie.js
  7. 2
      dist/fineui.js
  8. 2
      dist/fineui_without_jquery_polyfill.js
  9. 2
      src/core/events.js

2
dist/2.0/fineui.ie.js vendored

@ -17379,7 +17379,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/2.0/fineui.js vendored

@ -17379,7 +17379,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/bundle.ie.js vendored

@ -17379,7 +17379,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/bundle.js vendored

@ -17379,7 +17379,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/core.js vendored

@ -17379,7 +17379,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/fineui.ie.js vendored

@ -17624,7 +17624,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/fineui.js vendored

@ -17624,7 +17624,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
dist/fineui_without_jquery_polyfill.js vendored

@ -17125,7 +17125,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

2
src/core/events.js

@ -55,7 +55,7 @@ _.extend(BI, {
/**
* @static
* @property 取消挂载事件
* @property 挂载事件
*/
MOUNT: "_MOUNT",

Loading…
Cancel
Save