Pull request #2536: 无JIRA任务 feature: items和value支持自动watch

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '4b64392b7aa803c985eb225345fd52c8d817bc8c':
  feature: items和value支持自动watch

src/base/collection/collection.js

@@ -54,14 +54,14 @@ BI.CollectionView = BI.inherit(BI.Widget, {
         });
         // 兼容一下
         var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly;
-        if (overflowX === false) {
-            if (overflowY === false) {
+        if (o.overflowX === false) {
+            if (o.overflowY === false) {
                 scrollable = false;
             } else {
                 scrollable = "y"
             }
         } else {
-            if (overflowY === false) {
+            if (o.overflowY === false) {
                 scrollable = "x";
             }
         }

src/base/grid/grid.js

@@ -57,14 +57,14 @@ BI.GridView = BI.inherit(BI.Widget, {
         });
         // 兼容一下
         var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly;
-        if (overflowX === false) {
-            if (overflowY === false) {
+        if (o.overflowX === false) {
+            if (o.overflowY === false) {
                 scrollable = false;
             } else {
                 scrollable = "y"
             }
         } else {
-            if (overflowY === false) {
+            if (o.overflowY === false) {
                 scrollable = "x";
             }
         }