incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [2/7] Upgraded angular to fix nested tabs issue
Date Wed, 13 Nov 2013 03:29:20 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/251f613d/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js
b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js
index 0bf130a..d8abeb3 100644
--- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js
+++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/ui-bootstrap-tpls-0.6.0.js
@@ -2540,14 +2540,24 @@ function TabsetCtrl($scope, $element) {
     controller: 'TabsetController',
     templateUrl: 'template/tabs/tabset.html',
     compile: function(elm, attrs, transclude) {
-      return function(scope, element, attrs, tabsetCtrl) {
-        scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical)
: false;
-        scope.type = angular.isDefined(attrs.type) ? scope.$parent.$eval(attrs.type) : 'tabs';
-        scope.direction = angular.isDefined(attrs.direction) ? scope.$parent.$eval(attrs.direction)
: 'top';
-        scope.tabsAbove = (scope.direction != 'below');
-        tabsetCtrl.$scope = scope;
-        tabsetCtrl.$transcludeFn = transclude;
-      };
+      // return function(scope, element, attrs, tabsetCtrl) {
+      //   scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical)
: false;
+      //   scope.type = angular.isDefined(attrs.type) ? scope.$parent.$eval(attrs.type) :
'tabs';
+      //   scope.direction = angular.isDefined(attrs.direction) ? scope.$parent.$eval(attrs.direction)
: 'top';
+      //   scope.tabsAbove = (scope.direction != 'below');
+      //   tabsetCtrl.$scope = scope;
+      //   tabsetCtrl.$transcludeFn = transclude;
+      // };
+      return {
+        pre: function(scope, element, attrs, tabsetCtrl) {
+          scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical)
: false;
+          scope.type = angular.isDefined(attrs.type) ? scope.$parent.$eval(attrs.type) :
'tabs';
+          scope.direction = angular.isDefined(attrs.direction) ? scope.$parent.$eval(attrs.direction)
: 'top';
+          scope.tabsAbove = (scope.direction != 'below');
+          tabsetCtrl.$scope = scope;
+          tabsetCtrl.$transcludeFn = transclude;
+        }
+      }
     }
   };
 })


Mime
View raw message