fix tether-drop dependency after moving Grafana to webpack

This commit is contained in:
Alexander Zobnin
2017-10-11 20:04:49 +03:00
parent 2bf984c16b
commit 630dd17659
9 changed files with 70 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
'use strict';
System.register(['angular', 'jquery', 'tether-drop'], function (_export, _context) {
System.register(['angular', 'jquery'], function (_export, _context) {
"use strict";
var angular, $, Drop;
@@ -9,11 +9,21 @@ System.register(['angular', 'jquery', 'tether-drop'], function (_export, _contex
angular = _angular.default;
}, function (_jquery) {
$ = _jquery.default;
}, function (_tetherDrop) {
Drop = _tetherDrop.default;
}],
execute: function () {
System.config({
paths: {
tether: System.getConfig().baseURL + "plugins/alexanderzobnin-zabbix-app/vendor/npm/tether.min.js"
}
});
Drop = void 0;
System.amdRequire(["plugins/alexanderzobnin-zabbix-app/vendor/npm/drop.min.js"], function (drop) {
Drop = drop;
});
/** @ngInject */
angular.module('grafana.directives').directive('ackTooltip', function ($sanitize, $compile) {
var buttonTemplate = '<a bs-tooltip="\'Acknowledges ({{trigger.acknowledges.length}})\'"' + '<i ng-class="' + "{'fa fa-comments': trigger.acknowledges.length, " + "'fa fa-comments-o': !trigger.acknowledges.length, " + '}"></i></a>';

File diff suppressed because one or more lines are too long

View File

@@ -8,12 +8,19 @@ var _jquery = require('jquery');
var _jquery2 = _interopRequireDefault(_jquery);
var _tetherDrop = require('tether-drop');
var _tetherDrop2 = _interopRequireDefault(_tetherDrop);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
System.config({
paths: {
tether: System.getConfig().baseURL + "plugins/alexanderzobnin-zabbix-app/vendor/npm/tether.min.js"
}
});
var Drop = void 0;
System.amdRequire(["plugins/alexanderzobnin-zabbix-app/vendor/npm/drop.min.js"], function (drop) {
Drop = drop;
});
/** @ngInject */
_angular2.default.module('grafana.directives').directive('ackTooltip', function ($sanitize, $compile) {
var buttonTemplate = '<a bs-tooltip="\'Acknowledges ({{trigger.acknowledges.length}})\'"' + '<i ng-class="' + "{'fa fa-comments': trigger.acknowledges.length, " + "'fa fa-comments-o': !trigger.acknowledges.length, " + '}"></i></a>';
@@ -69,7 +76,7 @@ _angular2.default.module('grafana.directives').directive('ackTooltip', function
tooltip += addAckButtonTemplate;
tooltip += '</div>';
var drop = new _tetherDrop2.default({
var drop = new Drop({
target: element[0],
content: tooltip,
position: "bottom left",

1
dist/vendor/npm/drop.min.js vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/vendor/npm/tether.min.js vendored Normal file

File diff suppressed because one or more lines are too long