Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~zhenfei.li/fineui

dist/bundle.css

@@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;

dist/bundle.js

@@ -35104,11 +35104,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                 },
                 set: function reactiveSetter(newVal) {
                     var value = childOb ? childOb.model : val;
-                    if (newVal === value || newVal !== newVal && value !== value) {
+                    if (newVal === value || (newVal !== newVal && value !== value)) {
                         return;
                     }
                     val = newVal;
                     childOb = !shallow && observe(newVal, observer, key);
+                    if (childOb && value && value.__ob__) {
+                        childOb._scopeDeps = value.__ob__._scopeDeps;
+                        childOb._deps = value.__ob__._deps;
+                    }
                     obj[key] = childOb ? childOb.model : newVal;
                     notify(model.__ob__, key, dep);
                 }

dist/fineui.css

@@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;

dist/fineui.js

@@ -106,35 +106,7 @@ window.console = window.console || (function () {
         };
     return c;
 })();
-if (!Function.prototype.bind) {
+/*
-    Function.prototype.bind = function(oThis) {
-        if (typeof this !== 'function') {
-            // closest thing possible to the ECMAScript 5
-            // internal IsCallable function
-            throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
-        }
-
-        var aArgs   = Array.prototype.slice.call(arguments, 1),
-            fToBind = this,
-            fNOP    = function() {},
-            fBound  = function() {
-                return fToBind.apply(this instanceof fNOP
-                        ? this
-                        : oThis,
-                    // 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
-                    aArgs.concat(Array.prototype.slice.call(arguments)));
-            };
-
-        // 维护原型关系
-        if (this.prototype) {
-            // Function.prototype doesn't have a prototype property
-            fNOP.prototype = this.prototype;
-        }
-        fBound.prototype = new fNOP();
-
-        return fBound;
-    };
-}/*
  * 前端缓存
  */
 window.localStorage || (window.localStorage = {
@@ -35353,11 +35325,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                 },
                 set: function reactiveSetter(newVal) {
                     var value = childOb ? childOb.model : val;
-                    if (newVal === value || newVal !== newVal && value !== value) {
+                    if (newVal === value || (newVal !== newVal && value !== value)) {
                         return;
                     }
                     val = newVal;
                     childOb = !shallow && observe(newVal, observer, key);
+                    if (childOb && value && value.__ob__) {
+                        childOb._scopeDeps = value.__ob__._scopeDeps;
+                        childOb._deps = value.__ob__._deps;
+                    }
                     obj[key] = childOb ? childOb.model : newVal;
                     notify(model.__ob__, key, dep);
                 }

dist/fix/fix.js

@@ -563,11 +563,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                 },
                 set: function reactiveSetter(newVal) {
                     var value = childOb ? childOb.model : val;
-                    if (newVal === value || newVal !== newVal && value !== value) {
+                    if (newVal === value || (newVal !== newVal && value !== value)) {
                         return;
                     }
                     val = newVal;
                     childOb = !shallow && observe(newVal, observer, key);
+                    if (childOb && value && value.__ob__) {
+                        childOb._scopeDeps = value.__ob__._scopeDeps;
+                        childOb._deps = value.__ob__._deps;
+                    }
                     obj[key] = childOb ? childOb.model : newVal;
                     notify(model.__ob__, key, dep);
                 }

dist/polyfill.js

@@ -106,35 +106,7 @@ window.console = window.console || (function () {
         };
     return c;
 })();
-if (!Function.prototype.bind) {
+/*
-    Function.prototype.bind = function(oThis) {
-        if (typeof this !== 'function') {
-            // closest thing possible to the ECMAScript 5
-            // internal IsCallable function
-            throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
-        }
-
-        var aArgs   = Array.prototype.slice.call(arguments, 1),
-            fToBind = this,
-            fNOP    = function() {},
-            fBound  = function() {
-                return fToBind.apply(this instanceof fNOP
-                        ? this
-                        : oThis,
-                    // 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
-                    aArgs.concat(Array.prototype.slice.call(arguments)));
-            };
-
-        // 维护原型关系
-        if (this.prototype) {
-            // Function.prototype doesn't have a prototype property
-            fNOP.prototype = this.prototype;
-        }
-        fBound.prototype = new fNOP();
-
-        return fBound;
-    };
-}/*
  * 前端缓存
  */
 window.localStorage || (window.localStorage = {

dist/resource.css

@@ -1035,16 +1035,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -1056,16 +1046,6 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;

public/css/font.css

@@ -699,16 +699,6 @@
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -720,16 +710,6 @@
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;

src/core/func/dom.js

@@ -119,9 +119,11 @@ BI.extend(jQuery.fn, {
     },
 
     __isMouseInBounds__: function (e) {
-        var offset2Body = this.offset();
+        var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
-        return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + this.outerWidth()
+        var width = offset2Body.width || this.outerWidth();
-        || e.pageY < offset2Body.top || e.pageY > offset2Body.top + this.outerHeight());
+        var height = offset2Body.height || this.outerHeight();
+        return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width
+        || e.pageY < offset2Body.top || e.pageY > offset2Body.top + height);
     },
 
     __hasZIndexMask__: function (zindex) {

src/css/resource/font.css

@@ -699,16 +699,6 @@
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -720,16 +710,6 @@
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;

src/less/resource/font.less

@@ -93,8 +93,8 @@
 .font(drag-tag-font, @font-cross, @color-bi-text-redmark);
 
 //数值区间
-.font-hover-active(less-font, @font-less);
+.font(less-font, @font-less);
-.font-hover-active(less-equal-font, @font-less-equal);
+.font(less-equal-font, @font-less-equal);
 
 //文本控件
 .font(text-bold-font, @font-bold);

src/polyfill/function.js

@@ -1,29 +0,0 @@
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function(oThis) {
-        if (typeof this !== 'function') {
-            // closest thing possible to the ECMAScript 5
-            // internal IsCallable function
-            throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
-        }
-
-        var aArgs   = Array.prototype.slice.call(arguments, 1),
-            fToBind = this,
-            fNOP    = function() {},
-            fBound  = function() {
-                return fToBind.apply(this instanceof fNOP
-                        ? this
-                        : oThis,
-                    // 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
-                    aArgs.concat(Array.prototype.slice.call(arguments)));
-            };
-
-        // 维护原型关系
-        if (this.prototype) {
-            // Function.prototype doesn't have a prototype property
-            fNOP.prototype = this.prototype;
-        }
-        fBound.prototype = new fNOP();
-
-        return fBound;
-    };
-}

ui/css/font.css

@@ -699,16 +699,6 @@
   content: "\e75e";
   color: inherit;
 }
-.less-font:hover .b-font:before,
-.less-font.hover .b-font:before {
-  content: "\e75e";
-  color: inherit;
-}
-.less-font:active .b-font:before,
-.less-font.active .b-font:before {
-  content: "\e75e";
-  color: #3f8ce8;
-}
 .less-font.disabled .b-font:before {
   content: "\e75e";
   color: inherit;
@@ -720,16 +710,6 @@
   content: "\e761";
   color: inherit;
 }
-.less-equal-font:hover .b-font:before,
-.less-equal-font.hover .b-font:before {
-  content: "\e761";
-  color: inherit;
-}
-.less-equal-font:active .b-font:before,
-.less-equal-font.active .b-font:before {
-  content: "\e761";
-  color: #3f8ce8;
-}
 .less-equal-font.disabled .b-font:before {
   content: "\e761";
   color: inherit;