Merge branch 'master' of https://github.com/AllenFang/react-bootstrap…

…-table
AllenFang · Jan 25, 2016 · 8f8ce47 · 8f8ce47
2 parents dad7c1e + 0825072
commit 8f8ce47
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 40 deletions.
diff --git a/examples/index.html b/examples/index.html
@@ -4,6 +4,9 @@
     <meta charset="utf-8">
     <title>react-bootstrap-table demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+    <script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+
 </head>
 <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -59,7 +59,6 @@
   },
   "dependencies": {
     "classnames": "^2.1.2",
-    "react-onclickoutside": "^4.5.0",
     "react-toastr": "^2.3.1"
   },
   "peerDependencies": {

diff --git a/src/pagination/PaginationList.js b/src/pagination/PaginationList.js
@@ -1,31 +1,14 @@
 import React from 'react';
 import PageButton from './PageButton.js';
 import Const from '../Const';
-import listensToClickOutside from 'react-onclickoutside/decorator';
-
-@listensToClickOutside()
-class DropdownMenu extends React.Component {
-  handleClickOutside() {
-    this.props.hide();
-  }
-
-  render() {
-    return (
-      <ul className="dropdown-menu" role="menu" aria-labelledby="pageDropDown" style={{display: 'block'}}>
-        {this.props.children}
-      </ul>
-    );
-  }
-}
 
 class PaginationList extends React.Component {
 
   constructor(props) {
     super(props);
     this.state = {
       currentPage: this.props.currPage,
-      sizePerPage: this.props.sizePerPage,
-      dropdownVisible: false
+      sizePerPage: this.props.sizePerPage
     };
   }
 
@@ -62,7 +45,6 @@ class PaginationList extends React.Component {
 
   changeSizePerPage(e) {
     e.preventDefault();
-    this.setState({ dropdownVisible: false })
 
     var selectSize = parseInt(e.currentTarget.text);
     if (selectSize != this.state.sizePerPage) {
@@ -103,24 +85,17 @@ class PaginationList extends React.Component {
         {
           this.props.sizePerPageList.length > 1 ?
           <div className="dropdown">
-            <button
-              className="btn btn-default dropdown-toggle ignore-react-onclickoutside"
-              type="button"
-              id="pageDropDown"
-              onClick={() => this.setState({ dropdownVisible: !this.state.dropdownVisible })}
-              aria-expanded="true">
+            <button className="btn btn-default dropdown-toggle" type="button" id="pageDropDown" data-toggle="dropdown"
+                    aria-expanded="true">
               {this.state.sizePerPage}
               <span>
                 {" "}
                 <span className="caret"/>
               </span>
             </button>
-            { this.state.dropdownVisible ?
-              <DropdownMenu hide={() => this.setState({ dropdownVisible: false })}>
-                {sizePerPageList}
-              </DropdownMenu>
-              : ""
-            }
+            <ul className="dropdown-menu" role="menu" aria-labelledby="pageDropDown">
+              {sizePerPageList}
+            </ul>
           </div>
           : ""
         }

diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -20,14 +20,6 @@ module.exports = {
         amd: 'react'
       }
     },
-    {
-      'react-onclickoutside': {
-        root: 'OnClickOutside',
-        commonjs2: 'react-onclickoutside',
-        commonjs: 'react-onclickoutside',
-        amd: 'react-onclickoutside'
-      }
-    },
     {
       'react-dom': {
         root: 'ReactDOM',