caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #160 in FUI/fineui from ~GUY/fineui:master to master 

* commit 'cb6962602bc5be6753ff016fc53bb2bc88482547':
  update
es6
guy 7 years ago
parent
412c61ce90 cb6962602b
commit
59a34233dd
8 changed files with 71 additions and 320 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      bi/core.js
  2. 30
      bi/widget.js
  3. 76
      dist/bundle.js
  4. 88
      dist/bundle.min.js
  5. 46
      dist/core.js
  6. 30
      dist/widget.js
  7. 45
      src/core/proto/jquery.compact.js
  8. 30
      src/widget/arrangement/arrangement.js

46
bi/core.js
Unescape View File

@ -21189,51 +21189,7 @@ Function.prototype.after = function (func) {
func.apply(this, arguments);
return ret;
}
};//缓存this.element的操作数据
if (jQuery) {
function wrap(prefix, name) {
return "_bi-widget" + prefix + name;
}
(function ($) {
var css = $.fn.css;
$.fn.css = function (name, value) {
if (this._isWidget === true) {
var key;
//this.element不允许get样式
if (BI.isPlainObject(name)) {
for (key in name) {
this.css(key, name[key]);
}
return this;
}
key = wrap("css", name);
if (this[key] !== value) {
css.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return css.apply(this, arguments);
};
$.each(["width", "height"], function (index, name) {
var fn = $.fn[name];
$.fn[name] = function (value) {
if (this._isWidget === true && arguments.length === 1) {
var key = wrap("", name);
if (this[key] !== value) {
fn.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return fn.apply(this, arguments);
}
})
})(jQuery);
}if (jQuery) {
};if (jQuery) {
(function ($) {
// richer:容器在其各个边缘留出的空间
if (!$.fn.insets) {

30
bi/widget.js
Unescape View File

@ -1072,30 +1072,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) {
var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) {
if (region.el._left !== region.left) {
region.el.element.css({
left: region.left
});
region.el._left = region.left;
}
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.width;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
region.el.element.css({
left: region.left,
top: region.top,
width: region.width,
height: region.height
});
});
this._applyContainer();
this.ratio = this.getLayoutRatio();

76
dist/bundle.js vendored
Unescape View File

@ -21240,51 +21240,7 @@ Function.prototype.after = function (func) {
func.apply(this, arguments);
return ret;
}
};//缓存this.element的操作数据
if (jQuery) {
function wrap(prefix, name) {
return "_bi-widget" + prefix + name;
}
(function ($) {
var css = $.fn.css;
$.fn.css = function (name, value) {
if (this._isWidget === true) {
var key;
//this.element不允许get样式
if (BI.isPlainObject(name)) {
for (key in name) {
this.css(key, name[key]);
}
return this;
}
key = wrap("css", name);
if (this[key] !== value) {
css.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return css.apply(this, arguments);
};
$.each(["width", "height"], function (index, name) {
var fn = $.fn[name];
$.fn[name] = function (value) {
if (this._isWidget === true && arguments.length === 1) {
var key = wrap("", name);
if (this[key] !== value) {
fn.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return fn.apply(this, arguments);
}
})
})(jQuery);
}if (jQuery) {
};if (jQuery) {
(function ($) {
// richer:容器在其各个边缘留出的空间
if (!$.fn.insets) {
@ -76168,30 +76124,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) {
var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) {
if (region.el._left !== region.left) {
region.el.element.css({
left: region.left
});
region.el._left = region.left;
}
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.width;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
region.el.element.css({
left: region.left,
top: region.top,
width: region.width,
height: region.height
});
});
this._applyContainer();
this.ratio = this.getLayoutRatio();

88
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/core.js vendored
Unescape View File

@ -21189,51 +21189,7 @@ Function.prototype.after = function (func) {
func.apply(this, arguments);
return ret;
}
};//缓存this.element的操作数据
if (jQuery) {
function wrap(prefix, name) {
return "_bi-widget" + prefix + name;
}
(function ($) {
var css = $.fn.css;
$.fn.css = function (name, value) {
if (this._isWidget === true) {
var key;
//this.element不允许get样式
if (BI.isPlainObject(name)) {
for (key in name) {
this.css(key, name[key]);
}
return this;
}
key = wrap("css", name);
if (this[key] !== value) {
css.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return css.apply(this, arguments);
};
$.each(["width", "height"], function (index, name) {
var fn = $.fn[name];
$.fn[name] = function (value) {
if (this._isWidget === true && arguments.length === 1) {
var key = wrap("", name);
if (this[key] !== value) {
fn.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return fn.apply(this, arguments);
}
})
})(jQuery);
}if (jQuery) {
};if (jQuery) {
(function ($) {
// richer:容器在其各个边缘留出的空间
if (!$.fn.insets) {

30
dist/widget.js vendored
Unescape View File

@ -1072,30 +1072,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) {
var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) {
if (region.el._left !== region.left) {
region.el.element.css({
left: region.left
});
region.el._left = region.left;
}
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.width;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
region.el.element.css({
left: region.left,
top: region.top,
width: region.width,
height: region.height
});
});
this._applyContainer();
this.ratio = this.getLayoutRatio();

45
src/core/proto/jquery.compact.js
Unescape View File

@ -1,45 +0,0 @@
//缓存this.element的操作数据
if (jQuery) {
function wrap(prefix, name) {
return "_bi-widget" + prefix + name;
}
(function ($) {
var css = $.fn.css;
$.fn.css = function (name, value) {
if (this._isWidget === true) {
var key;
//this.element不允许get样式
if (BI.isPlainObject(name)) {
for (key in name) {
this.css(key, name[key]);
}
return this;
}
key = wrap("css", name);
if (this[key] !== value) {
css.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return css.apply(this, arguments);
};
$.each(["width", "height"], function (index, name) {
var fn = $.fn[name];
$.fn[name] = function (value) {
if (this._isWidget === true && arguments.length === 1) {
var key = wrap("", name);
if (this[key] !== value) {
fn.apply(this, arguments);
this[key] = value;
return this;
}
return this;
}
return fn.apply(this, arguments);
}
})
})(jQuery);
}

30
src/widget/arrangement/arrangement.js
Unescape View File

@ -272,30 +272,12 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) {
var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) {
if (region.el._left !== region.left) {
region.el.element.css({
left: region.left
});
region.el._left = region.left;
}
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.width;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
region.el.element.css({
left: region.left,
top: region.top,
width: region.width,
height: region.height
});
});
this._applyContainer();
this.ratio = this.getLayoutRatio();

Write Preview
Loading…
Cancel
Save