Kouhei Sutou
null+****@clear*****
Mon Nov 23 11:54:42 JST 2015
Kouhei Sutou 2015-11-23 11:54:42 +0900 (Mon, 23 Nov 2015) New Revision: 785dc8f5c70dcd09bd41c615f5520405673051b9 https://github.com/groonga/groonga-admin/commit/785dc8f5c70dcd09bd41c615f5520405673051b9 Message: Add clear query button Modified files: app/index.html app/scripts/controllers/table-search-controller.js app/views/tables/search.html bower.json Modified: app/index.html (+1 -12) =================================================================== --- app/index.html 2015-11-23 11:46:40 +0900 (94030ef) +++ app/index.html 2015-11-23 11:54:42 +0900 (a8a91c2) @@ -50,18 +50,7 @@ <script src="bower_components/modernizr/modernizr.js"></script> <script src="bower_components/jquery/dist/jquery.js"></script> <script src="bower_components/angular/angular.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js"></script> - <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js"></script> + <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script> <script src="bower_components/angular-resource/angular-resource.js"></script> <script src="bower_components/angular-cookies/angular-cookies.js"></script> <script src="bower_components/angular-sanitize/angular-sanitize.js"></script> Modified: app/scripts/controllers/table-search-controller.js (+6 -0) =================================================================== --- app/scripts/controllers/table-search-controller.js 2015-11-23 11:46:40 +0900 (eae7709) +++ app/scripts/controllers/table-search-controller.js 2015-11-23 11:54:42 +0900 (a40c912) @@ -61,6 +61,7 @@ angular.module('groongaAdminApp') $scope.search = search; $scope.incrementalSearch = incrementalSearch; + $scope.clearQuery = clearQuery; $scope.clear = clear; $scope.toggleSort = toggleSort; $scope.selectDrilldown = selectDrilldown; @@ -195,6 +196,11 @@ angular.module('groongaAdminApp') select(buildParameters()); } + function clearQuery() { + $scope.parameters.query = ''; + incrementalSearch(); + } + function clear() { $location.search({}); } Modified: app/views/tables/search.html (+6 -0) =================================================================== --- app/views/tables/search.html 2015-11-23 11:46:40 +0900 (6842b0a) +++ app/views/tables/search.html 2015-11-23 11:54:42 +0900 (6e0cf13) @@ -107,6 +107,12 @@ class="form-control" ng-model="parameters.query" ng-change="incrementalSearch()"> + <span class="input-group-btn"> + <button ng-click="clearQuery()" class="btn btn-default"> + <span title="Clear query" + class="glyphicon glyphicon-erase"></span> + </button> + </span> </div> </div> <div class="form-group time-query" Modified: bower.json (+1 -1) =================================================================== --- bower.json 2015-11-23 11:46:40 +0900 (ca2c46d) +++ bower.json 2015-11-23 11:54:42 +0900 (8e26743) @@ -20,7 +20,7 @@ "angular": "~1.3.0", "json3": "~3.3.1", "es5-shim": "~3.1.0", - "bootstrap-sass-official": "~3.2.0", + "bootstrap-sass-official": "~3.3.0", "angular-resource": "~1.3.0", "angular-cookies": "~1.3.0", "angular-sanitize": "~1.3.0", -------------- next part -------------- HTML����������������������������...다운로드
