in progress work

This commit is contained in:
Torkel Ödegaard
2016-02-22 15:15:01 +01:00
parent 3f05b4bb1e
commit 3231d767d5
2 changed files with 11 additions and 13 deletions
+10 -12
View File
@@ -4,6 +4,7 @@ import config from 'app/core/config';
import _ from 'lodash'; import _ from 'lodash';
import $ from 'jquery'; import $ from 'jquery';
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
import Drop from 'tether-drop';
/** @ngInject **/ /** @ngInject **/
function popoverSrv($templateCache, $timeout, $q, $http, $compile) { function popoverSrv($templateCache, $timeout, $q, $http, $compile) {
@@ -26,21 +27,18 @@ function popoverSrv($templateCache, $timeout, $q, $http, $compile) {
$timeout(function() { $timeout(function() {
var template = _.isString(result) ? result : result.data; var template = _.isString(result) ? result : result.data;
var drop = new Drop({
options.element.popover({ target: options.element[0],
content: template, content: template,
placement: options.placement || 'bottom', position: 'bottom top',
html: true classes: 'drop-help',
openOn: 'click',
tetherOptions: {
}
}); });
var popover = options.element.data('popover'); drop.open();
popover.hasContent = function () { //$compile(popover.$tip)(popover.scope);
return template;
};
popover.toggle();
popover.scope = options.scope;
$compile(popover.$tip)(popover.scope);
}, 1); }, 1);
}); });
}; };
+1 -1
View File
@@ -76,7 +76,7 @@
img { img {
width: 30px; width: 30px;
position: relative; position: relative;
top: -2px; top: -1px;
} }
.navbar-brand-btn-background { .navbar-brand-btn-background {