From 2b2492d2d42311bb59405954e6251c9d1e2288d8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Mon, 13 Jan 2014 11:59:58 -0600
Subject: [PATCH] add padding classname for content directive

---
 js/ext/angular/src/directive/ionicContent.js       | 11 ++++++-----
 js/ext/angular/test/directive/ionicContent.unit.js |  8 ++++++++
 js/ext/angular/test/tabs.html                      |  6 +++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js
index aadbfd5e97..b1fdaeb415 100644
--- a/js/ext/angular/src/directive/ionicContent.js
+++ b/js/ext/angular/src/directive/ionicContent.js
@@ -47,16 +47,17 @@ angular.module('ionic.ui.content', ['ionic.ui.service'])
       if(attr.hasSubheader == "true") { element.addClass('has-subheader'); }
       if(attr.hasFooter == "true") { element.addClass('has-footer'); }
       if(attr.hasTabs == "true") { element.addClass('has-tabs'); }
+      if(attr.padding == "true") { 
+        var scroll = element.find('.scroll');
+        if(scroll.length) {
+          scroll.addClass('padding');
+        }
+      }
 
       return function link($scope, $element, $attr) {
         var clone, sc, sv,
           c = angular.element($element.children()[0]);
 
-        // if padding attribute is true, then add padding if it wasn't added to the .scroll
-        if($scope.$eval($scope.padding) === true) {
-          c.addClass('padding');
-        }
-
         if($scope.scroll === "false") {
           // No scrolling
           return;
diff --git a/js/ext/angular/test/directive/ionicContent.unit.js b/js/ext/angular/test/directive/ionicContent.unit.js
index b49bcbdcc8..3a8434aa93 100644
--- a/js/ext/angular/test/directive/ionicContent.unit.js
+++ b/js/ext/angular/test/directive/ionicContent.unit.js
@@ -20,6 +20,14 @@ describe('Ionic Content directive', function() {
     expect(element.hasClass('has-header')).toEqual(true);
   });
 
+  it('should add padding classname', function() {
+    element = compile('<content padding="true"></content>')(scope);
+    expect(element.hasClass('scroll-content')).toEqual(true);
+    expect(element.hasClass('padding')).toEqual(false);
+    var scrollElement = element.find('.scroll');
+    expect(scrollElement.hasClass('padding')).toEqual(true);
+  });
+
   /**
    * Not currently possible to mock this AFAIK
    */
diff --git a/js/ext/angular/test/tabs.html b/js/ext/angular/test/tabs.html
index 0a1ec6a52f..65a8e3d801 100644
--- a/js/ext/angular/test/tabs.html
+++ b/js/ext/angular/test/tabs.html
@@ -94,7 +94,7 @@
         <header class="bar bar-header bar-positive">
           <h1 class="title">Deadlines</h1>
         </header>
-        <content has-header="true">
+        <content has-header="true" padding="true">
           <h1>Deadlines</h1>
         </content>
       </tab>
@@ -103,7 +103,7 @@
         <header class="bar bar-header bar-positive">
           <h1 class="title">Settings</h1>
         </header>
-        <content has-header="true">
+        <content has-header="true" padding="true">
           <h1>Settings</h1>
         </content>
       </tab>
@@ -112,7 +112,7 @@
         <header class="bar bar-header bar-positive">
           <h1 class="title">Settings</h1>
         </header>
-        <content has-header="true">
+        <content has-header="true" padding="true">
           <h1>Settings</h1>
         </content>
       </tab>