Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerhokp committed Aug 4, 2016
1 parent 1ffda6a commit f0a973a
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 38 deletions.
33 changes: 21 additions & 12 deletions dist/browser.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,36 @@ var link = function link(scope, element, attrs) {

var tooltipInstance = void 0,
config = {};
var getOpt = function getOpt() {
opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
return opt;
};

angular.forEach(PROPS, function (prop) {
return attrs.$observe(prop, function (data) {
attrs.$observe(prop, function (data) {
return config[prop] = data;
});

if (tooltipInstance) {
tooltipInstance.setOptions(getOpt());
}
});

scope.$watch('tooltipEnabled', function (enabled) {
if (enabled === undefined || enabled) {
var opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
tooltipInstance = new Tooltip(opt);
tooltipInstance = new Tooltip(getOpt());
} else if (tooltipInstance) {
tooltipInstance.destroy();
tooltipInstance = null;
}
});

Expand Down
33 changes: 21 additions & 12 deletions dist/directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,36 @@ var link = function link(scope, element, attrs) {

var tooltipInstance = void 0,
config = {};
var getOpt = function getOpt() {
opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
return opt;
};

angular.forEach(PROPS, function (prop) {
return attrs.$observe(prop, function (data) {
attrs.$observe(prop, function (data) {
return config[prop] = data;
});

if (tooltipInstance) {
tooltipInstance.setOptions(getOpt());
}
});

scope.$watch('tooltipEnabled', function (enabled) {
if (enabled === undefined || enabled) {
var opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
tooltipInstance = new Tooltip(opt);
tooltipInstance = new Tooltip(getOpt());
} else if (tooltipInstance) {
tooltipInstance.destroy();
tooltipInstance = null;
}
});

Expand Down
37 changes: 23 additions & 14 deletions src/directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,34 @@ const PROPS = {
const link = (scope, element, attrs) => {

let tooltipInstance, config = {};
angular.forEach(PROPS, prop =>
attrs.$observe(prop, data => config[prop] = data)
);
const getOpt = () => {
opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
return opt;
}

angular.forEach(PROPS, prop => {
attrs.$observe(prop, data => config[prop] = data);

if (tooltipInstance) {
tooltipInstance.setOptions(getOpt())
}
});

scope.$watch('tooltipEnabled', enabled => {
if (enabled === undefined || enabled) {
let opt = {
target: element[0],
content: config[PROPS.tooltip] || config[PROPS.content]
};
if (config[PROPS.classes]) {
opt.classes = config[PROPS.classes];
}
if (config[PROPS.position]) {
opt.position = config[PROPS.position];
}
tooltipInstance = new Tooltip(opt);
tooltipInstance = new Tooltip(getOpt());
} else if (tooltipInstance) {
tooltipInstance.destroy();
tooltipInstance = null;
}
});

Expand Down

0 comments on commit f0a973a

Please sign in to comment.