Browse Source

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

# Conflicts:
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/core.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/fineui_without_jquery_polyfill.js
#	dist/utils.min.js
es6
Zhenfei.Li 6 years ago
parent
commit
c132cb9554
  1. 120481
      dist/bundle.js
  2. 4
      dist/bundle.min.js
  3. 37987
      dist/core.js
  4. 120110
      dist/fineui.js
  5. 4
      dist/fineui.min.js
  6. 164879
      dist/fineui_without_jquery_polyfill.js
  7. 2
      dist/utils.min.js
  8. 4
      src/core/func/array.js

120481
dist/bundle.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

37987
dist/core.js vendored

File diff suppressed because one or more lines are too long

120110
dist/fineui.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

164879
dist/fineui_without_jquery_polyfill.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
src/core/func/array.js

@ -10,13 +10,13 @@ _.extend(BI, {
}
},
pushDistinct: function (sArray, obj) {
if (!BI.contains(obj)) {
if (!BI.contains(sArray, obj)) {
sArray.push(obj);
}
},
pushDistinctArray: function (sArray, array) {
for (var i = 0, len = array.length; i < len; i++) {
sArray.pushDistinct(array[i]);
BI.pushDistinct(sArray, array[i]);
}
}
});

Loading…
Cancel
Save