You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/27 21:20:53 UTC
[02/11] git commit: fix title
fix title
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f5afdebd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f5afdebd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f5afdebd
Branch: refs/pull/84/head
Commit: f5afdebdceeefe39d83359dab94da5fce3c29033
Parents: 3090ddc
Author: Shawn Feldman <sh...@gmail.com>
Authored: Thu Mar 27 14:10:45 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Thu Mar 27 14:10:45 2014 -0600
----------------------------------------------------------------------
portal/js/global/page-title.js | 13 ++++---------
portal/js/usergrid-dev.min.js | 8 +++-----
portal/js/usergrid.min.js | 6 +++---
3 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5afdebd/portal/js/global/page-title.js
----------------------------------------------------------------------
diff --git a/portal/js/global/page-title.js b/portal/js/global/page-title.js
index 93148d7..241e372 100644
--- a/portal/js/global/page-title.js
+++ b/portal/js/global/page-title.js
@@ -1,15 +1,10 @@
'use strict';
-
-AppServices.Directives.directive('pageTitle', ["$rootScope","data", function ($rootScope,data) {
+AppServices.Directives.directive('pageTitle', ['$rootScope','ug', function ($rootScope,ug) {
return{
- restrict: 'ECA',
- scope: {
-
- },
+ restrict: 'E',
transclude: true,
- templateUrl: 'global/page-title.html',
- replace: true,
- link: function linkFn(scope, lElement, attrs, parentCtrl) {
+ templateUrl:'global/page-title.html',
+ link: function linkFn(scope, lElement, attrs) {
scope.title = attrs.title;
scope.icon = attrs.icon;
scope.showHelp = function () {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5afdebd/portal/js/usergrid-dev.min.js
----------------------------------------------------------------------
diff --git a/portal/js/usergrid-dev.min.js b/portal/js/usergrid-dev.min.js
index ffa623e..f79f9dc 100644
--- a/portal/js/usergrid-dev.min.js
+++ b/portal/js/usergrid-dev.min.js
@@ -1588,14 +1588,12 @@
};
} ]);
"use strict";
- AppServices.Directives.directive("pageTitle", [ "$rootScope", "data", function($rootScope, data) {
+ AppServices.Directives.directive("pageTitle", [ "$rootScope", "ug", function($rootScope, ug) {
return {
- restrict: "ECA",
- scope: {},
+ restrict: "E",
transclude: true,
templateUrl: "global/page-title.html",
- replace: true,
- link: function linkFn(scope, lElement, attrs, parentCtrl) {
+ link: function linkFn(scope, lElement, attrs) {
scope.title = attrs.title;
scope.icon = attrs.icon;
scope.showHelp = function() {