Skip to content

Commit

Permalink
Merge pull request #1 from hctpbl/refactor/rename-tooltip-template-at…
Browse files Browse the repository at this point in the history
…tribute-name

Refactor/rename tooltip template attribute name
  • Loading branch information
hctpbl authored Feb 23, 2017
2 parents ab7ee4d + 7d68de7 commit f819816
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "angular-tooltips",
"name": "angular-tooltips-stylesage",
"version": "1.1.10",
"description": "Angular.js tooltips module.",
"authors": [
Expand All @@ -20,7 +20,7 @@
"./dist/angular-tooltips.min.css"
],
"license": "MIT",
"homepage": "http://720kb.github.io/angular-tooltips",
"homepage": "https://github.com/hctpbl/angular-tooltips",
"ignore": [
"**/.*",
"node_modules",
Expand Down
6 changes: 3 additions & 3 deletions lib/angular-tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,13 @@

var linkingFunction = function linkingFunction($scope, $element, $attrs, $controllerDirective, $transcludeFunc) {

if ($attrs.tooltipTemplate &&
if ($attrs.tooltipTemplateText &&
$attrs.tooltipTemplateUrl) {

throw new Error('You can not define tooltip-template and tooltip-template-url together');
}

if (!($attrs.tooltipTemplateUrl || $attrs.tooltipTemplate) &&
if (!($attrs.tooltipTemplateUrl || $attrs.tooltipTemplateText) &&
$attrs.tooltipController) {

throw new Error('You can not have a controller without a template or templateUrl defined');
Expand Down Expand Up @@ -752,7 +752,7 @@
tipElement.addClass('_hidden');

tipTipElement.append(closeButtonElement);
tipTipElement.append($attrs.tooltipTemplate);
tipTipElement.append($attrs.tooltipTemplateText);

tipElement.append(tipTipElement);
tipElement.append(tipArrowElement);
Expand Down

0 comments on commit f819816

Please sign in to comment.