diff --git a/server.js b/server.js index a9fd0cede..5e080f9d4 100644 --- a/server.js +++ b/server.js @@ -9,5 +9,5 @@ const port = 3000; app.use(express.static("./")); app.listen(port, function() { console.log("server start"); - open('http://localhost:' + port + '/index.html'); + open('http://localhost:' + port + '/examples/useContext.html'); }); diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js index 8d26825d5..f45437627 100644 --- a/src/base/collection/collection.js +++ b/src/base/collection/collection.js @@ -290,7 +290,7 @@ BI.CollectionView = BI.inherit(BI.Widget, { if (scrollx) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "x") { return true; } return false; @@ -306,7 +306,7 @@ BI.CollectionView = BI.inherit(BI.Widget, { if (scrolly) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "y") { return true; } return false;