Updated Branches:
  refs/heads/trunk 4fad13ca7 -> 31820900a

AMBARI-2758. Jobs page: table is not striped and pagination is not disabled. 
(Andrii Babiichuk via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/31820900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/31820900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/31820900

Branch: refs/heads/trunk
Commit: 31820900a992b65cfad06935f455480113b29bd6
Parents: 4fad13c
Author: Yusaku Sako <[email protected]>
Authored: Mon Jul 29 13:27:44 2013 -0700
Committer: Yusaku Sako <[email protected]>
Committed: Mon Jul 29 13:27:44 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/views/main/apps_view.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/31820900/ambari-web/app/views/main/apps_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/apps_view.js 
b/ambari-web/app/views/main/apps_view.js
index 9d8f110..2d449cd 100644
--- a/ambari-web/app/views/main/apps_view.js
+++ b/ambari-web/app/views/main/apps_view.js
@@ -29,14 +29,13 @@ App.MainAppsView = Em.View.extend({
     tagName: 'a',
     template: Ember.Handlebars.compile('<i class="icon-arrow-left"></i>'),
     classNameBindings: ['class'],
-    class: "",
-    calculateClass: function () {
+    class: function () {
       if (parseInt(this.get("controller.paginationObject.startIndex")) > 1) {
-        this.set("class", "paginate_previous");
+        return "paginate_previous";
       } else {
-        this.set("class", "paginate_disabled_previous");
+        return "paginate_disabled_previous";
       }
-    }.observes("controller.paginationObject"),
+    }.property("controller.paginationObject.startIndex"),
     click: function (event) {
       if (this.get('class') == "paginate_previous") {
         var startIndex = 
parseInt(this.get("controller.paginationObject.startIndex")) - 1;
@@ -50,14 +49,13 @@ App.MainAppsView = Em.View.extend({
     tagName: 'a',
     template: Ember.Handlebars.compile('<i class="icon-arrow-right"></i>'),
     classNameBindings: ['class'],
-    class: "",
-    calculateClass: function () {
+    class: function () {
       if ((parseInt(this.get("controller.paginationObject.endIndex"))) < 
parseInt(this.get("controller.paginationObject.iTotalDisplayRecords"))) {
-        this.set("class", "paginate_next");
+        return "paginate_next";
       } else {
-        this.set("class", "paginate_disabled_next");
+        return "paginate_disabled_next";
       }
-    }.observes("controller.paginationObject"),
+    }.property("controller.paginationObject.endIndex"),
     click: function (event) {
       if (this.get('class') == "paginate_next") {
         var startDisplayValue = 
parseInt(this.get("controller.paginationObject.endIndex"));
@@ -326,7 +324,7 @@ App.MainAppsView = Em.View.extend({
     onLoad: function() {
       var run = this.get('parentView.run');
       if (run.index) {
-        var strip = (run.index % 2) ? 'odd' : 'even';
+        var strip = (run.index % 2) ? 'even' : 'odd';
         this.$().addClass(strip);
       }
     }.observes('parentView.run'),

Reply via email to