Cleaning up

jonniedarko · jonniedarko · commit 82369aa7fa22 · 2014-05-06T21:00:47.000+01:00
diff --git a/app.js b/app.js
@@ -94,4 +94,11 @@ app.controller('macroCtrl', function ($scope){
 	    }
 	}
 
+	$scope.getName = function(){
+            if($scope.user.name===undefined || $scope.user.name==="")
+                return "";
+
+            return $scope.user.name+"'s";
+        }
+
 });
diff --git a/index.html b/index.html
@@ -41,7 +41,7 @@
             <div class="row">
                <div class="col-sm-12">
                   <p class="bg-primary kcal-flash">
-                   <b>&nbsp;{{user.name}}&nbsp;Basic Metabolic Rate: &nbsp; </b>&nbsp; {{ getMetaRate()}}
+                  <b>&nbsp;{{getName(user.name)}}&nbsp;Basic Metabolic Rate: &nbsp; </b>&nbsp; {{ getMetaRate()}}
                   </p>
                </div>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,11 @@ app.controller('macroCtrl', function ($scope){`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ $scope.getName = function(){`
	`98`	`+ if($scope.user.name===undefined \|\| $scope.user.name==="")`
	`99`	`+ return "";`
	`100`	`+`
	`101`	`+ return $scope.user.name+"'s";`
	`102`	`+ }`
	`103`	`+`
`97`	`104`	`});`