From d0e4c2392767692ceffd33b7714379def6ca094b Mon Sep 17 00:00:00 2001 From: Adrian Lee Date: Sun, 16 Mar 2014 15:56:05 -0700 Subject: [PATCH] refactor(macTooltip): Namespaced tooltip class names to prevent style conflicts BREAKING CHANGE `tooltip` class has been renamed to `mac-tooltip` --- src/css/tooltip.styl | 2 +- src/directives/tooltip.coffee | 2 +- test/unit/tooltip.spec.coffee | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/css/tooltip.styl b/src/css/tooltip.styl index 983429f..2af70d8 100644 --- a/src/css/tooltip.styl +++ b/src/css/tooltip.styl @@ -1,4 +1,4 @@ -.tooltip +.mac-tooltip background rgba(47,48,53,0.75) text-align center color #FFF diff --git a/src/directives/tooltip.coffee b/src/directives/tooltip.coffee index 5242667..1eab21e 100644 --- a/src/directives/tooltip.coffee +++ b/src/directives/tooltip.coffee @@ -46,7 +46,7 @@ angular.module("Mac").directive "macTooltip", [ ## Check if the tooltip still exist, remove if it does removeTip(0) - tooltip = angular.element """
#{text}
""" + tooltip = angular.element """
#{text}
""" tip.append tooltip # Only get element offset when not adding tooltip within the element. diff --git a/test/unit/tooltip.spec.coffee b/test/unit/tooltip.spec.coffee index 7883503..4bb5de7 100644 --- a/test/unit/tooltip.spec.coffee +++ b/test/unit/tooltip.spec.coffee @@ -10,7 +10,7 @@ describe "Mac Tooltip", -> $timeout = _$timeout_ afterEach -> - $(".tooltip").remove() + $(".mac-tooltip").remove() describe "Basic Initialization", -> @@ -19,7 +19,7 @@ describe "Mac Tooltip", -> $rootScope.$digest() tip.trigger "mouseenter" - expect($(".tooltip").length).toBe 1 + expect($(".mac-tooltip").length).toBe 1 it "should display the correct message", -> tip = $compile("
") $rootScope @@ -35,19 +35,19 @@ describe "Mac Tooltip", -> $rootScope.$digest() tip.trigger "mouseenter" - expect($(".tooltip").length).toBe 1 + expect($(".mac-tooltip").length).toBe 1 tip.trigger "mouseleave" $timeout.flush() - expect($(".tooltip").length).toBe 0 + expect($(".mac-tooltip").length).toBe 0 it "should show and hide on click", -> tip = $compile("
") $rootScope $rootScope.$digest() # show tip.trigger "click" - expect($(".tooltip").length).toBe 1 + expect($(".mac-tooltip").length).toBe 1 # hide tip.trigger "click" @@ -69,7 +69,7 @@ describe "Mac Tooltip", -> tip.trigger "mouseenter" - expect($(".tooltip").hasClass "top").toBe true + expect($(".mac-tooltip").hasClass "top").toBe true it "should set the direction to bottom", -> tip = $compile("
") $rootScope @@ -77,7 +77,7 @@ describe "Mac Tooltip", -> tip.trigger "mouseenter" - expect($(".tooltip").hasClass "bottom").toBe true + expect($(".mac-tooltip").hasClass "bottom").toBe true describe "disabled", -> @@ -86,14 +86,14 @@ describe "Mac Tooltip", -> $rootScope.$digest() tip.trigger "mouseenter" - expect($(".tooltip").length).toBe 0 + expect($(".mac-tooltip").length).toBe 0 it "should create a tooltip", -> tip = $compile("
") $rootScope $rootScope.$digest() tip.trigger "mouseenter" - expect($(".tooltip").length).toBe 1 + expect($(".mac-tooltip").length).toBe 1 describe "Inside", -> @@ -103,7 +103,7 @@ describe "Mac Tooltip", -> tip.trigger "mouseenter" - expect($(".tooltip", tip).length).toBe 1 + expect($(".mac-tooltip", tip).length).toBe 1 it "should not append tooltip inside of trigger", -> tip = $compile("
") $rootScope @@ -111,4 +111,4 @@ describe "Mac Tooltip", -> tip.trigger "mouseenter" - expect($(".tooltip", tip).length).toBe 0 + expect($(".mac-tooltip", tip).length).toBe 0