release v2.5.1

jquense · Apr 20, 2015 · b2a4974 · b2a4974
1 parent 9fa804c
commit b2a4974
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "react-widgets",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "main": "dist/react-widgets.js",
   "description": "A set of input widgets for React",
   "homepage": "http://jquense.github.io/react-widgets/docs",

diff --git a/dist/react-widgets.js b/dist/react-widgets.js
diff --git a/lib/DropdownList.js b/lib/DropdownList.js
@@ -166,8 +166,9 @@ var DropdownList = React.createClass({
       React.createElement(
         Popup,
         babelHelpers._extends({}, _.pick(this.props, Object.keys(compat.type(Popup).propTypes)), {
+          onOpen: this.focus,
           onOpening: function () {
-            return (_this.refs.list.forceUpdate(), _this.focus());
+            return _this.refs.list.forceUpdate();
           },
           onRequestClose: this.close }),
         React.createElement(

diff --git a/lib/mixins/PopupScrollToMixin.js b/lib/mixins/PopupScrollToMixin.js
@@ -3,24 +3,27 @@ var scrollTo = require("../util/dom/scroll");
 
 module.exports = {
 
-  _scrollTo: function (selected, list, focused) {
-    var state = this._scrollState || (this._scrollState = {}),
-        handler = this.props.onMove,
-        lastVisible = state.visible,
-        lastItem = state.focused,
-        shown,
-        changed;
+    _scrollTo: function (selected, list, focused) {
+        var state = this._scrollState || (this._scrollState = {}),
+            handler = this.props.onMove,
+            lastVisible = state.visible,
+            lastItem = state.focused,
+            shown,
+            changed;
 
-    state.visible = !(!list.offsetWidth || !list.offsetHeight);
-    state.focused = focused;
+        state.visible = !(!list.offsetWidth || !list.offsetHeight);
+        state.focused = focused;
 
-    changed = lastItem !== focused;
-    shown = state.visible && !lastVisible;
+        changed = lastItem !== focused;
+        shown = state.visible && !lastVisible
 
-    if (shown || state.visible && changed) {
-      if (handler) handler(selected, list, focused);else {
-        state.scrollCancel && state.scrollCancel();
-        state.scrollCancel = scrollTo(selected, list);
-      }
-    }
-  } };
+        // if ( shown || (state.visible && changed) ){
+        //   if ( handler )
+        //     handler(selected, list, focused)
+        //   else {
+        //     state.scrollCancel && state.scrollCancel()
+        //     state.scrollCancel = scrollTo(selected, list)
+        //   }
+        // }
+        ;
+    } };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-widgets",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A set of input widgets for React",
   "main": "lib/index.js",
   "author": {