diff --git a/src/notify.coffee b/src/notify.coffee index 63b27c2..966ccfd 100644 --- a/src/notify.coffee +++ b/src/notify.coffee @@ -6,7 +6,7 @@ pluginName = 'notify' className = '__'+pluginName -positions = +positions = t: 'top' m: 'middle' b: 'bottom' @@ -94,34 +94,28 @@ styles = """ user: - default: + bootstrap: html: """ -
+
""" - css: """ - .#{className}Default { - background: #fff; - font-size: 11px; - box-shadow: 0 0 6px #000; - -moz-box-shadow: 0 0 6px #000; - -webkit-box-shadow: 0 0 6px #000; - padding: 4px 10px 4px 8px; - border-radius: 6px; - border-style: solid; - border-width: 2px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - white-space: nowrap; - } - """ + classes: + base: """ + padding: 8px 35px 8px 14px; + margin-bottom: 20px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: #fcf8e3; + border: 1px solid #fbeed5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + """ + error: + info: + warn: - bootstrap: + bootstrap: html: """
@@ -197,7 +191,7 @@ incr = (obj, pos, val) -> return if isNaN val - opp = positions[opposites[pos.charAt(0)]] + opp = positions[opposites[pos.charAt(0)]] temp = pos #use the opposite if exists @@ -228,14 +222,14 @@ insertCSS = (style) -> $("head").append elem style.cssElem = elem - try + try elem.html style.css catch e #ie fix elem[0].styleSheet.cssText = style.css #define plugin class Notification - + #setup instance variables constructor: (elem, data, options) -> options = {color: options} if typeof options is 'string' @@ -285,7 +279,7 @@ class Notification show: (show, callback = $.noop) -> hidden = @container.parent().parents(':hidden').length > 0 - + elems = @container.add @arrow args = [] @@ -304,7 +298,7 @@ class Notification args.push callback - elems[fn].apply elems, args + elems[fn].apply elems, args updatePosition: -> return unless @elem @@ -337,7 +331,7 @@ class Notification # unless navigator.userAgent.match /MSIE/ # incr css, 'top', (elemPos.top - wrapPos.top) incr css, 'left', elemPos.left - wrapPos.left - + #correct for left margin margin = parseInt @elem.css("margin-left"), 10 incr css, 'left', margin if margin @@ -385,7 +379,7 @@ class Notification if pos[0] not in mainPositions throw "Must be one of [#{mainPositions}]" - + if pos.length is 1 or (pos[0] in vPositions and pos[1] not in hPositions) or (pos[0] in hPositions and pos[1] not in vPositions) @@ -404,7 +398,7 @@ class Notification styleColors = @getStyle().colors return (styleColors and styleColors[@options.color]) or - @options.colors[@options.color] or + @options.colors[@options.color] or @options.color getStyle: (name) -> @@ -426,7 +420,7 @@ class Notification run: (data, options) -> #update options if $.isPlainObject(options) - $.extend @options, options + $.extend @options, options #shortcut special case else if $.type(options) is 'string' @options.color = options