mirror of
https://github.com/wahyd4/pinpoint.git
synced 2026-08-28 22:26:47 +10:00
Merge pull request #1156 from denzelsN/master
add version parameter of directive template html with variable.
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/agentChartGroup/agentChartGroup.html?v=${buildTime}',
|
||||
templateUrl: 'features/agentChartGroup/agentChartGroup.html?v=' + G_BUILD_TIME,
|
||||
scope: {
|
||||
namespace: '@'
|
||||
},
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/agentInfo/agentInfo.html?v=${buildTime}',
|
||||
templateUrl: 'features/agentInfo/agentInfo.html?v' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define private variables
|
||||
@@ -27,7 +27,7 @@
|
||||
broadcastToCpuLoadChart, broadcastToTpsChart, resetServerMetaDataDiv, initTooltip;
|
||||
|
||||
// initialize
|
||||
scope.agentInfoTemplate = 'features/agentInfo/agentInfoReady.html?v=${buildTime}';
|
||||
scope.agentInfoTemplate = 'features/agentInfo/agentInfoReady.html?v=' + G_BUILD_TIME;
|
||||
oAlertService = new AlertsService();
|
||||
oProgressBarService = new ProgressBarService();
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
* scope event of agentInfo.initialize
|
||||
*/
|
||||
scope.$on('agentInfoDirective.initialize', function (event, navbarVoService, agent) {
|
||||
scope.agentInfoTemplate = 'features/agentInfo/agentInfoMain.html?v=${buildTime}';
|
||||
scope.agentInfoTemplate = 'features/agentInfo/agentInfoMain.html?v=' + G_BUILD_TIME;
|
||||
scope.agent = agent;
|
||||
oNavbarVoService = navbarVoService;
|
||||
scope.chartGroup = null;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/agentList/agentList.html?v=${buildTime}',
|
||||
templateUrl: 'features/agentList/agentList.html?v=' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define private variables of methods
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/configuration/alarm/alarmGroupMember.html?v=${buildTime}',
|
||||
templateUrl: 'features/configuration/alarm/alarmGroupMember.html?v=' + G_BUILD_TIME,
|
||||
scope: true,
|
||||
link: function (scope, element) {
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/configuration/alarm/alarmPinpointUser.html?v=${buildTime}',
|
||||
templateUrl: 'features/configuration/alarm/alarmPinpointUser.html?v=' + G_BUILD_TIME,
|
||||
scope: true,
|
||||
link: function (scope, element) {
|
||||
var $element = $(element);
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/configuration/alarm/alarmRule.html?v=${buildTime}',
|
||||
templateUrl: 'features/configuration/alarm/alarmRule.html?v=' + G_BUILD_TIME,
|
||||
scope: true,
|
||||
link: function (scope, element) {
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/configuration/alarm/alarmUserGroup.html?v=${buildTime}',
|
||||
templateUrl: 'features/configuration/alarm/alarmUserGroup.html?v=' + G_BUILD_TIME,
|
||||
scope: true,
|
||||
link: function (scope, element) {
|
||||
scope.prefix = "alarmUserGroup_";
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/linkInfoDetails/linkInfoDetails.html?v=${buildTime}',
|
||||
templateUrl: 'features/linkInfoDetails/linkInfoDetails.html?v=' + G_BUILD_TIME,
|
||||
scope: true,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/navbar/navbar.html?v=${buildTime}',
|
||||
templateUrl: 'features/navbar/navbar.html?v=' + G_BUILD_TIME,
|
||||
link: function (scope, element) {
|
||||
|
||||
// define private variables
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/nodeInfoDetails/nodeInfoDetails.html?v=${buildTime}',
|
||||
templateUrl: 'features/nodeInfoDetails/nodeInfoDetails.html?v=' + G_BUILD_TIME,
|
||||
scope: {},
|
||||
link: function postLink(scope, element) {
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/serverMap/serverMap.html?v=${buildTime}',
|
||||
templateUrl: 'features/serverMap/serverMap.html?v=' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define private variables
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/sidebar/filter/filterInformation.html?v=${buildTime}',
|
||||
templateUrl: 'features/sidebar/filter/filterInformation.html?v=' + G_BUILD_TIME,
|
||||
scope : {
|
||||
namespace : '@' // string value
|
||||
},
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
return {
|
||||
restrict: 'E',
|
||||
replace: true,
|
||||
templateUrl: 'features/sidebar/title/sidebarTitle.html?v=${buildTime}',
|
||||
templateUrl: 'features/sidebar/title/sidebarTitle.html?v=' + G_BUILD_TIME,
|
||||
scope: {
|
||||
namespace: '@'
|
||||
},
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/timeSlider/timeSlider.html?v=${buildTime}',
|
||||
templateUrl: 'features/timeSlider/timeSlider.html?v=' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define variables
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/timeline/timeline.html?v=${buildTime}',
|
||||
templateUrl: 'features/timeline/timeline.html?v=' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define private variables of methods
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
templateUrl: 'features/transactionTable/transactionTable.html?v=${buildTime}',
|
||||
templateUrl: 'features/transactionTable/transactionTable.html?v=' + G_BUILD_TIME,
|
||||
link: function postLink(scope, element, attrs) {
|
||||
|
||||
// define private variables of methods
|
||||
|
||||
@@ -511,6 +511,9 @@
|
||||
<script src="pages/transactionView/transaction-view.controller.js?v=${buildTime}"></script>
|
||||
<script src="pages/scatterFullScreenMode/scatter-full-screen-mode.controller.js?v=${buildTime}"></script>
|
||||
<script src="features/realtimeChart/realtime-chart.controller.js?v=${buildTime}"></script>
|
||||
<script>
|
||||
G_BUILD_TIME = "${buildTime}";
|
||||
</script>
|
||||
<!-- endbuild -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user