You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/22 09:57:56 UTC
[2/2] ignite git commit: IGNITE-843 implemented fix for select all /
none on large items count in dropdown.
IGNITE-843 implemented fix for select all / none on large items count in dropdown.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a4f34b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a4f34b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a4f34b3
Branch: refs/heads/ignite-843
Commit: 3a4f34b3b8d478b02953e5cdf8fda57d0dbdde21
Parents: 3468915
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Sep 22 14:57:54 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Sep 22 14:57:54 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/includes/controls.jade | 2 +-
.../control-center-web/src/main/js/views/templates/layout.jade | 5 ++++-
.../control-center-web/src/main/js/views/templates/select.jade | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a4f34b3/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index d9a44a7..1bd8474 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -151,7 +151,7 @@ mixin details-row
.col-sm-8
+tipField('detail.tip')
.input-tip
- button.select-toggle.form-control(bs-select ng-model-options='{debounce: 500}' data-multiple='1' data-placeholder='{{::detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}' tabindex='-1')&attributes(detailCommon)&attributes(dropdownPlaceholder)
+ button.select-toggle.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}' tabindex='-1')&attributes(detailCommon)&attributes(dropdownPlaceholder)
.group-section(ng-switch-when='table-simple')&attributes(detailCommon)
.col-sm-12.group(id='{{::detail.model}}')
.group-legend
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a4f34b3/modules/control-center-web/src/main/js/views/templates/layout.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/layout.jade b/modules/control-center-web/src/main/js/views/templates/layout.jade
index 15d7649..18c6d3d 100644
--- a/modules/control-center-web/src/main/js/views/templates/layout.jade
+++ b/modules/control-center-web/src/main/js/views/templates/layout.jade
@@ -42,7 +42,10 @@ html(ng-app='ignite-web-control-center' ng-init='user = #{JSON.stringify(user)};
script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.5/angular-sanitize.min.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.5/angular-animate.min.js')
- script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.2/angular-strap.js')
+ // script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.2/angular-strap.js')
+ // script(src='/js/angular-strap-2.3.2.js')
+ script(src='//cdn.rawgit.com/akuznetsov-gridgain/angular-strap/fix-1852/dist/angular-strap.min.js')
+
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.2/angular-strap.tpl.min.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-smart-table/2.1.3/smart-table.js')
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a4f34b3/modules/control-center-web/src/main/js/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/select.jade b/modules/control-center-web/src/main/js/views/templates/select.jade
index 7f08a88..3ff8d21 100644
--- a/modules/control-center-web/src/main/js/views/templates/select.jade
+++ b/modules/control-center-web/src/main/js/views/templates/select.jade
@@ -16,8 +16,8 @@
ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 2)')
- a(id='li-dropdown-select-all' ng-click='$selectAll()') {{$allText}} ({{$matches.length}})
- a(id='li-dropdown-select-none' ng-click='$selectNone()') {{$noneText}}
+ a(id='li-dropdown-select-all' ng-click='$selectAllAtOnce()') {{$allText}} ({{$matches.length}})
+ a(id='li-dropdown-select-none' ng-click='$selectNoneAtOnce()') {{$noneText}}
hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')
hr(ng-if='match.value == undefined' style='margin: 5px 0')