From fabc93802f6c3830053693cbad70a8b856f214c4 Mon Sep 17 00:00:00 2001 From: Jaime Pillora Date: Mon, 3 Jun 2013 09:15:58 +1000 Subject: [PATCH] updated --- dist/notify.js | 49 +++++++++++++++++++++------------- dist/notify.min.js | 4 +-- examples/position.html | 2 +- src/notify.coffee | 60 +++++++++++++++++++++++------------------- 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/dist/notify.js b/dist/notify.js index 922c134..9c5333d 100644 --- a/dist/notify.js +++ b/dist/notify.js @@ -1,11 +1,11 @@ -/** Notify.js - v0.0.1 - 2013/05/31 +/** Notify.js - v0.0.1 - 2013/06/03 * http://notifyjs.com/ * Copyright (c) 2013 Jaime Pillora - MIT */ (function(window,document,undefined) { 'use strict'; -var Notification, className, cornerElem, createElem, getAnchorElement, hPositions, incr, inherit, insertCSS, mainPositions, opposites, parsePosition, pluginName, pluginOptions, positions, realign, styles, vPositions, +var Notification, className, cornerElem, createElem, getAnchorElement, hAligns, incr, inherit, insertCSS, mainPositions, opposites, parsePosition, pluginName, pluginOptions, positions, realign, styles, vAligns, __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; pluginName = 'notify'; @@ -21,9 +21,9 @@ positions = { r: 'right' }; -hPositions = ['l', 'c', 'r']; +hAligns = ['l', 'c', 'r']; -vPositions = ['t', 'm', 'b']; +vAligns = ['t', 'm', 'b']; mainPositions = ['t', 'b', 'l', 'r']; @@ -51,8 +51,8 @@ parsePosition = function(str) { styles = { core: { - html: "
\n
\n
\n
\n
", - css: "." + className + "Corner {\n position: fixed;\n top: 0;\n right: 0;\n margin: 5px;\n z-index: 1050;\n}\n\n." + className + "Corner ." + className + "Wrapper,\n." + className + "Corner ." + className + "Container {\n position: relative;\n display: block;\n height: inherit;\n width: inherit;\n}\n\n." + className + "Wrapper {\n z-index: 1;\n position: absolute;\n display: inline-block;\n height: 0;\n width: 0;\n}\n\n." + className + "Debug {\n position: absolute;\n border: 3px solid red;\n height: 0;\n width: 0;\n}\n\n." + className + "Container {\n display: none;\n z-index: 1;\n position: absolute;\n cursor: pointer;\n}\n\n." + className + "Text {\n position: relative;\n}\n\n." + className + "Arrow {\n position: absolute;\n z-index: 2;\n width: 0;\n height: 0;\n}\n" + html: "
\n
\n
\n
", + css: "." + className + "Corner {\n position: fixed;\n top: 0;\n right: 0;\n margin: 5px;\n z-index: 1050;\n}\n\n." + className + "Corner ." + className + "Wrapper,\n." + className + "Corner ." + className + "Container {\n position: relative;\n display: block;\n height: inherit;\n width: inherit;\n}\n\n." + className + "Wrapper {\n z-index: 1;\n position: absolute;\n display: inline-block;\n height: 0;\n width: 0;\n}\n\n." + className + "Container {\n display: none;\n z-index: 1;\n position: absolute;\n cursor: pointer;\n}\n\n." + className + "Text {\n position: relative;\n}\n\n." + className + "Arrow {\n position: absolute;\n z-index: 2;\n width: 0;\n height: 0;\n}\n" }, user: { "default": { @@ -76,7 +76,7 @@ pluginOptions = { arrowSize: 5, position: 'bottom', style: 'default', - color: 'red', + color: 'black', colors: { red: '#b94a48', green: '#33be40', @@ -245,18 +245,19 @@ Notification = (function() { }; Notification.prototype.updatePosition = function() { - var arrowCss, color, contH, contW, css, elemH, elemPos, elemW, mainFull, margin, opp, oppFull, pAlign, pArrow, pMain, padding, pos, posFull, position, size, wrapPos, _i, _len; + var arrowCss, arrowSize, color, contH, contW, css, elemH, elemIH, elemIW, elemPos, elemW, mainFull, margin, opp, oppFull, pAlign, pArrow, pMain, padding, pos, posFull, position, wrapPos, _i, _len; if (!this.elem) { return; } elemPos = this.elem.position(); elemH = this.elem.outerHeight(); elemW = this.elem.outerWidth(); + elemIH = this.elem.innerHeight(); + elemIW = this.elem.innerWidth(); wrapPos = this.wrapper.position(); contH = this.container.height(); contW = this.container.width(); position = this.getPosition(); - console.log(position); pMain = position[0]; pAlign = position[1]; pArrow = position[2] || pAlign; @@ -281,7 +282,7 @@ Notification = (function() { if (!this.options.arrowShow) { this.arrow.hide(); } else { - size = this.options.arrowSize; + arrowSize = this.options.arrowSize; arrowCss = $.extend({}, css); for (_i = 0, _len = mainPositions.length; _i < _len; _i++) { pos = mainPositions[_i]; @@ -290,21 +291,31 @@ Notification = (function() { continue; } color = posFull === mainFull ? this.getColor() : 'transparent'; - arrowCss["border-" + posFull] = "" + size + "px solid " + color; + arrowCss["border-" + posFull] = "" + arrowSize + "px solid " + color; + } + incr(css, positions[opp], arrowSize); + if (__indexOf.call(mainPositions, pAlign) >= 0) { + incr(arrowCss, positions[pAlign], arrowSize * 2); } - incr(css, positions[opp], size); - this.arrow.css(arrowCss).show(); } - if (__indexOf.call(vPositions, pMain) >= 0) { + if (__indexOf.call(vAligns, pMain) >= 0) { incr(css, 'left', realign(pAlign, contW, elemW)); - } - if (__indexOf.call(hPositions, pMain) >= 0) { + if (arrowCss) { + incr(arrowCss, 'left', realign(pAlign, arrowSize, elemIW)); + } + } else if (__indexOf.call(hAligns, pMain) >= 0) { incr(css, 'top', realign(pAlign, contH, elemH)); + if (arrowCss) { + incr(arrowCss, 'top', realign(pAlign, arrowSize, elemIH)); + } } if (this.container.is(":visible")) { css.display = 'block'; } - return this.container.removeAttr('style').css(css); + this.container.removeAttr('style').css(css); + if (arrowCss) { + return this.arrow.removeAttr('style').css(arrowCss); + } }; Notification.prototype.getPosition = function() { @@ -317,8 +328,8 @@ Notification = (function() { if (_ref = pos[0], __indexOf.call(mainPositions, _ref) < 0) { throw "Must be one of [" + mainPositions + "]"; } - if (pos.length === 1 || ((_ref1 = pos[0], __indexOf.call(vPositions, _ref1) >= 0) && (_ref2 = pos[1], __indexOf.call(hPositions, _ref2) < 0)) || ((_ref3 = pos[0], __indexOf.call(hPositions, _ref3) >= 0) && (_ref4 = pos[1], __indexOf.call(vPositions, _ref4) < 0))) { - pos[1] = (_ref5 = pos[0], __indexOf.call(hPositions, _ref5) >= 0) ? 'm' : 'l'; + if (pos.length === 1 || ((_ref1 = pos[0], __indexOf.call(vAligns, _ref1) >= 0) && (_ref2 = pos[1], __indexOf.call(hAligns, _ref2) < 0)) || ((_ref3 = pos[0], __indexOf.call(hAligns, _ref3) >= 0) && (_ref4 = pos[1], __indexOf.call(vAligns, _ref4) < 0))) { + pos[1] = (_ref5 = pos[0], __indexOf.call(hAligns, _ref5) >= 0) ? 'm' : 'l'; } if (!this.options.autoReposition) { return pos; diff --git a/dist/notify.min.js b/dist/notify.min.js index 58a87fb..1dd25b2 100644 --- a/dist/notify.min.js +++ b/dist/notify.min.js @@ -1,4 +1,4 @@ -/** Notify.js - v0.0.1 - 2013/05/31 +/** Notify.js - v0.0.1 - 2013/06/03 * http://notifyjs.com/ * Copyright (c) 2013 Jaime Pillora - MIT - */(function(t,n,i){"use strict";var e,o,r,s,a,l,h,p,d,u,c,f,w,y,m,g,A,b,x=[].indexOf||function(t){for(var n=0,i=this.length;i>n;n++)if(n in this&&this[n]===t)return n;return-1};w="notify",o="__"+w,m={t:"top",m:"middle",b:"bottom",l:"left",c:"center",r:"right"},l=["l","c","r"],b=["t","m","b"],u=["t","b","l","r"],c={t:"b",m:null,b:"t",l:"r",c:null,r:"l"},f=function(t){var n;return n=[],$.each(t.split(/\W+/),function(t,e){var o;return o=e.toLowerCase().charAt(0),m[o]?n.push(o):i}),n},A={core:{html:'
\n
\n
\n
\n
',css:"."+o+"Corner {\n position: fixed;\n top: 0;\n right: 0;\n margin: 5px;\n z-index: 1050;\n}\n\n."+o+"Corner ."+o+"Wrapper,\n."+o+"Corner ."+o+"Container {\n position: relative;\n display: block;\n height: inherit;\n width: inherit;\n}\n\n."+o+"Wrapper {\n z-index: 1;\n position: absolute;\n display: inline-block;\n height: 0;\n width: 0;\n}\n\n."+o+"Debug {\n position: absolute;\n border: 3px solid red;\n height: 0;\n width: 0;\n}\n\n."+o+"Container {\n display: none;\n z-index: 1;\n position: absolute;\n cursor: pointer;\n}\n\n."+o+"Text {\n position: relative;\n}\n\n."+o+"Arrow {\n position: absolute;\n z-index: 2;\n width: 0;\n height: 0;\n}\n"},user:{"default":{html:'
\n \n
',css:"."+o+"Default {\n background: #fff;\n font-size: 11px;\n box-shadow: 0 0 6px #000;\n -moz-box-shadow: 0 0 6px #000;\n -webkit-box-shadow: 0 0 6px #000;\n padding: 4px 10px 4px 8px;\n border-radius: 6px;\n border-style: solid;\n border-width: 2px;\n -moz-border-radius: 6px;\n -webkit-border-radius: 6px;\n white-space: nowrap;\n}"},bootstrap:{html:'
\n \n
',css:"."+o+"Bootstrap {\n white-space: nowrap;\n margin: 5px !important;\n padding-left: 25px !important;\n background-repeat: no-repeat;\n background-position: 3px 7px;\n background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtRJREFUeNqkVc1u00AQHq+dOD+0poIQfkIjalW0SEGqRMuRnHos3DjwAH0ArlyQeANOOSMeAA5VjyBxKBQhgSpVUKKQNGloFdw4cWw2jtfMOna6JOUArDTazXi/b3dm55socPqQhFka++aHBsI8GsopRJERNFlY88FCEk9Yiwf8RhgRyaHFQpPHCDmZG5oX2ui2yilkcTT1AcDsbYC1NMAyOi7zTX2Agx7A9luAl88BauiiQ/cJaZQfIpAlngDcvZZMrl8vFPK5+XktrWlx3/ehZ5r9+t6e+WVnp1pxnNIjgBe4/6dAysQc8dsmHwPcW9C0h3fW1hans1ltwJhy0GxK7XZbUlMp5Ww2eyan6+ft/f2FAqXGK4CvQk5HueFz7D6GOZtIrK+srupdx1GRBBqNBtzc2AiMr7nPplRdKhb1q6q6zjFhrklEFOUutoQ50xcX86ZlqaZpQrfbBdu2R6/G19zX6XSgh6RX5ubyHCM8nqSID6ICrGiZjGYYxojEsiw4PDwMSL5VKsC8Yf4VRYFzMzMaxwjlJSlCyAQ9l0CW44PBADzXhe7xMdi9HtTrdYjFYkDQL0cn4Xdq2/EAE+InCnvADTf2eah4Sx9vExQjkqXT6aAERICMewd/UAp/IeYANM2joxt+q5VI+ieq2i0Wg3l6DNzHwTERPgo1ko7XBXj3vdlsT2F+UuhIhYkp7u7CarkcrFOCtR3H5JiwbAIeImjT/YQKKBtGjRFCU5IUgFRe7fF4cCNVIPMYo3VKqxwjyNAXNepuopyqnld602qVsfRpEkkz+GFL1wPj6ySXBpJtWVa5xlhpcyhBNwpZHmtX8AGgfIExo0ZpzkWVTBGiXCSEaHh62/PoR0p/vHaczxXGnj4bSo+G78lELU80h1uogBwWLf5YlsPmgDEd4M236xjm+8nm4IuE/9u+/PH2JXZfbwz4zw1WbO+SQPpXfwG/BBgAhCNZiSb/pOQAAAAASUVORK5CYII=);\n}",colors:{red:"#eed3d7"}}}},y={autoHide:!1,autoHideDelay:2e3,arrowShow:!0,arrowSize:5,position:"bottom",style:"default",color:"red",colors:{red:"#b94a48",green:"#33be40",black:"#393939",blue:"#00f"},showAnimation:"slideDown",showDuration:400,hideAnimation:"slideUp",hideDuration:200,offsetY:0,offsetX:0},s=function(t){return $("<"+t+">")},p=function(t,n){var i;return i=function(){},i.prototype=t,$.extend(!0,new i,n)},r=s("div").addClass(""+o+"Corner"),a=function(t){var n;return t.is("[type=radio]")&&(n=t.parents("form:first").find("[type=radio]").filter(function(n,i){return $(i).attr("name")===t.attr("name")}),t=n.first()),t},h=function(t,n,e){var o,r;if("string"==typeof e)e=parseInt(e,10);else if("number"!=typeof e)return;if(!isNaN(e))return o=m[c[n.charAt(0)]],r=n,t[o]!==i&&(n=m[o.charAt(0)],e*=-1),t[n]===i?t[n]=e:t[n]+=e,null},g=function(t,n,i){if("l"===t||"t"===t)return 0;if("c"===t||"m"===t)return i/2-n/2;if("r"===t||"b"===t)return i-n;throw"Invalid alignment"},d=function(t){var n;if(t&&t.css&&(n=t.cssElem,!n)){n=s("style"),$("head").append(n),t.cssElem=n;try{return n.html(t.css)}catch(i){return n[0].styleSheet.cssText=t.css}}},e=function(){function t(t,n,i){"string"==typeof i&&(i={color:i}),this.options=p(y,$.isPlainObject(i)?i:{}),this.loadCSS(),this.loadHTML(),this.wrapper=$(A.core.html),this.wrapper.data(o,this),this.arrow=this.wrapper.find("."+o+"Arrow"),this.container=this.wrapper.find("."+o+"Container"),this.container.append(this.userContainer),t&&t.length?(this.elementType=t.attr("type"),this.originalElement=t,this.elem=a(t),this.elem.data(o,this),this.elem.before(this.wrapper)):(this.options.arrowShow=!1,r.prepend(this.wrapper)),this.container.hide(),this.run(n)}return t.prototype.loadCSS=function(t){var n;return t||(n=this.options.style,t=this.getStyle(n)),d(t)},t.prototype.loadHTML=function(){var t;if(t=this.getStyle(),this.userContainer=$(t.html),this.text=this.userContainer.find("[data-notify-text]"),0===this.text.length)throw"style: "+name+" HTML is missing the: 'data-notify-text' attribute";return this.text.addClass(""+o+"Text")},t.prototype.show=function(t,n){var i,e,o,r;if(null==n&&(n=$.noop),r=this.container.parent().parents(":hidden").length>0,e=this.container.add(this.arrow),i=[],r&&t)o="show";else if(r&&!t)o="hide";else if(!r&&t)o=this.options.showAnimation,i.push(this.options.showDuration);else{if(r||t)return n();o=this.options.hideAnimation,i.push(this.options.hideDuration)}return i.push(n),e[o].apply(e,i)},t.prototype.updatePosition=function(){var t,n,i,e,o,r,s,a,p,d,f,w,y,A,v,C,S,k,R,B,D,H,I;if(this.elem){if(s=this.elem.position(),r=this.elem.outerHeight(),a=this.elem.outerWidth(),D=this.wrapper.position(),i=this.container.height(),e=this.container.width(),R=this.getPosition(),console.log(R),v=R[0],y=R[1],A=R[2]||y,p=m[v],f=c[v],w=m[f],o={},o[w]="b"===v?r:"r"===v?a:0,h(o,"left",s.left-D.left),d=parseInt(this.elem.css("margin-left"),10),d&&h(o,"left",d),/^inline/.test(this.elem.css("display"))&&(C=parseInt(this.elem.css("padding-top"),10),C&&h(o,"top",-C)),h(o,"top",this.options.offsetY),h(o,"left",this.options.offsetX),this.options.arrowShow){for(B=this.options.arrowSize,t=$.extend({},o),H=0,I=u.length;I>H;H++)S=u[H],k=m[S],S!==f&&(n=k===p?this.getColor():"transparent",t["border-"+k]=""+B+"px solid "+n);h(o,m[f],B),this.arrow.css(t).show()}else this.arrow.hide();return x.call(b,v)>=0&&h(o,"left",g(y,e,a)),x.call(l,v)>=0&&h(o,"top",g(y,i,r)),this.container.is(":visible")&&(o.display="block"),this.container.removeAttr("style").css(o)}},t.prototype.getPosition=function(){var t,n,i,e,o,r,s,a;if(n=this.options.position,t=f(n),0===t.length&&(t[0]="b"),i=t[0],0>x.call(u,i))throw"Must be one of ["+u+"]";if((1===t.length||(e=t[0],x.call(b,e)>=0&&(o=t[1],0>x.call(l,o)))||(r=t[0],x.call(l,r)>=0&&(s=t[1],0>x.call(b,s))))&&(t[1]=(a=t[0],x.call(l,a)>=0?"m":"l")),!this.options.autoReposition)return t;throw"Not implemented"},t.prototype.getColor=function(){var t;return t=this.getStyle().colors,t&&t[this.options.color]||this.options.colors[this.options.color]||this.options.color},t.prototype.getStyle=function(t){var n;if(t||(t=this.options.style),t||(t="default"),n=A.user[t],!n)throw"Missing style: "+t;return n},t.prototype.updateStyle=function(){var t=this;return this.wrapper.find("[data-notify-style]").each(function(n,i){return $(i).attr("style",$(i).attr("data-notify-style").replace(/\{\{\s*color\s*\}\}/gi,t.getColor()))})},t.prototype.run=function(t,n){var e=this;return $.isPlainObject(n)?$.extend(this.options,n):"string"===$.type(n)&&(this.options.color=n),this.container&&!t?(this.show(!1),i):this.container||t?("string"===$.type(t)?this.text.html(t.replace("\n","
")):this.text.empty().append(t),this.updatePosition(),this.show(!0),this.options.autoHide?(clearTimeout(this.autohideTimer),this.autohideTimer=setTimeout(function(){return e.show(!1)},this.options.autoHideDelay)):i):i},t.prototype.destroy=function(){var t=this;return this.show(!1,function(){return t.wrapper.remove()})},t}(),$(function(){return $("body").append(r),$("link").each(function(){var t,n;return n=$(this).attr("href"),n.match(/bootstrap/)?(t=!0,!1):i}),d(A.core),$(n).on("click","."+o+"Wrapper",function(){var t;return(t=$(this).data(o))?t.elem?t.show(!1):t.destroy():i})}),$[w]=function(t,n,i){return t&&t.nodeName||t.jquery?$(t)[w](n,i):(i=n,n=t,new e(null,n,i)),t},$[w].options=function(t){return $.extend(y,t)},$[w].styles=function(t){return $.extend(!0,A.user,t)},$[w].insertCSS=d,$.fn[w]=function(t,n){return $(this).each(function(){var i;return i=a($(this)).data(o),i?i.run(t,n):new e($(this),t,n)}),this}})(window,document); \ No newline at end of file + */(function(t,n,e){"use strict";var i,o,r,s,a,l,h,p,u,d,c,f,w,y,m,A,g,b,x=[].indexOf||function(t){for(var n=0,e=this.length;e>n;n++)if(n in this&&this[n]===t)return n;return-1};w="notify",o="__"+w,m={t:"top",m:"middle",b:"bottom",l:"left",c:"center",r:"right"},l=["l","c","r"],b=["t","m","b"],d=["t","b","l","r"],c={t:"b",m:null,b:"t",l:"r",c:null,r:"l"},f=function(t){var n;return n=[],$.each(t.split(/\W+/),function(t,i){var o;return o=i.toLowerCase().charAt(0),m[o]?n.push(o):e}),n},g={core:{html:'
\n
\n
\n
',css:"."+o+"Corner {\n position: fixed;\n top: 0;\n right: 0;\n margin: 5px;\n z-index: 1050;\n}\n\n."+o+"Corner ."+o+"Wrapper,\n."+o+"Corner ."+o+"Container {\n position: relative;\n display: block;\n height: inherit;\n width: inherit;\n}\n\n."+o+"Wrapper {\n z-index: 1;\n position: absolute;\n display: inline-block;\n height: 0;\n width: 0;\n}\n\n."+o+"Container {\n display: none;\n z-index: 1;\n position: absolute;\n cursor: pointer;\n}\n\n."+o+"Text {\n position: relative;\n}\n\n."+o+"Arrow {\n position: absolute;\n z-index: 2;\n width: 0;\n height: 0;\n}\n"},user:{"default":{html:'
\n \n
',css:"."+o+"Default {\n background: #fff;\n font-size: 11px;\n box-shadow: 0 0 6px #000;\n -moz-box-shadow: 0 0 6px #000;\n -webkit-box-shadow: 0 0 6px #000;\n padding: 4px 10px 4px 8px;\n border-radius: 6px;\n border-style: solid;\n border-width: 2px;\n -moz-border-radius: 6px;\n -webkit-border-radius: 6px;\n white-space: nowrap;\n}"},bootstrap:{html:'
\n \n
',css:"."+o+"Bootstrap {\n white-space: nowrap;\n margin: 5px !important;\n padding-left: 25px !important;\n background-repeat: no-repeat;\n background-position: 3px 7px;\n background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtRJREFUeNqkVc1u00AQHq+dOD+0poIQfkIjalW0SEGqRMuRnHos3DjwAH0ArlyQeANOOSMeAA5VjyBxKBQhgSpVUKKQNGloFdw4cWw2jtfMOna6JOUArDTazXi/b3dm55socPqQhFka++aHBsI8GsopRJERNFlY88FCEk9Yiwf8RhgRyaHFQpPHCDmZG5oX2ui2yilkcTT1AcDsbYC1NMAyOi7zTX2Agx7A9luAl88BauiiQ/cJaZQfIpAlngDcvZZMrl8vFPK5+XktrWlx3/ehZ5r9+t6e+WVnp1pxnNIjgBe4/6dAysQc8dsmHwPcW9C0h3fW1hans1ltwJhy0GxK7XZbUlMp5Ww2eyan6+ft/f2FAqXGK4CvQk5HueFz7D6GOZtIrK+srupdx1GRBBqNBtzc2AiMr7nPplRdKhb1q6q6zjFhrklEFOUutoQ50xcX86ZlqaZpQrfbBdu2R6/G19zX6XSgh6RX5ubyHCM8nqSID6ICrGiZjGYYxojEsiw4PDwMSL5VKsC8Yf4VRYFzMzMaxwjlJSlCyAQ9l0CW44PBADzXhe7xMdi9HtTrdYjFYkDQL0cn4Xdq2/EAE+InCnvADTf2eah4Sx9vExQjkqXT6aAERICMewd/UAp/IeYANM2joxt+q5VI+ieq2i0Wg3l6DNzHwTERPgo1ko7XBXj3vdlsT2F+UuhIhYkp7u7CarkcrFOCtR3H5JiwbAIeImjT/YQKKBtGjRFCU5IUgFRe7fF4cCNVIPMYo3VKqxwjyNAXNepuopyqnld602qVsfRpEkkz+GFL1wPj6ySXBpJtWVa5xlhpcyhBNwpZHmtX8AGgfIExo0ZpzkWVTBGiXCSEaHh62/PoR0p/vHaczxXGnj4bSo+G78lELU80h1uogBwWLf5YlsPmgDEd4M236xjm+8nm4IuE/9u+/PH2JXZfbwz4zw1WbO+SQPpXfwG/BBgAhCNZiSb/pOQAAAAASUVORK5CYII=);\n}",colors:{red:"#eed3d7"}}}},y={autoHide:!1,autoHideDelay:2e3,arrowShow:!0,arrowSize:5,position:"bottom",style:"default",color:"black",colors:{red:"#b94a48",green:"#33be40",black:"#393939",blue:"#00f"},showAnimation:"slideDown",showDuration:400,hideAnimation:"slideUp",hideDuration:200,offsetY:0,offsetX:0},s=function(t){return $("<"+t+">")},p=function(t,n){var e;return e=function(){},e.prototype=t,$.extend(!0,new e,n)},r=s("div").addClass(""+o+"Corner"),a=function(t){var n;return t.is("[type=radio]")&&(n=t.parents("form:first").find("[type=radio]").filter(function(n,e){return $(e).attr("name")===t.attr("name")}),t=n.first()),t},h=function(t,n,i){var o,r;if("string"==typeof i)i=parseInt(i,10);else if("number"!=typeof i)return;if(!isNaN(i))return o=m[c[n.charAt(0)]],r=n,t[o]!==e&&(n=m[o.charAt(0)],i*=-1),t[n]===e?t[n]=i:t[n]+=i,null},A=function(t,n,e){if("l"===t||"t"===t)return 0;if("c"===t||"m"===t)return e/2-n/2;if("r"===t||"b"===t)return e-n;throw"Invalid alignment"},u=function(t){var n;if(t&&t.css&&(n=t.cssElem,!n)){n=s("style"),$("head").append(n),t.cssElem=n;try{return n.html(t.css)}catch(e){return n[0].styleSheet.cssText=t.css}}},i=function(){function t(t,n,e){"string"==typeof e&&(e={color:e}),this.options=p(y,$.isPlainObject(e)?e:{}),this.loadCSS(),this.loadHTML(),this.wrapper=$(g.core.html),this.wrapper.data(o,this),this.arrow=this.wrapper.find("."+o+"Arrow"),this.container=this.wrapper.find("."+o+"Container"),this.container.append(this.userContainer),t&&t.length?(this.elementType=t.attr("type"),this.originalElement=t,this.elem=a(t),this.elem.data(o,this),this.elem.before(this.wrapper)):(this.options.arrowShow=!1,r.prepend(this.wrapper)),this.container.hide(),this.run(n)}return t.prototype.loadCSS=function(t){var n;return t||(n=this.options.style,t=this.getStyle(n)),u(t)},t.prototype.loadHTML=function(){var t;if(t=this.getStyle(),this.userContainer=$(t.html),this.text=this.userContainer.find("[data-notify-text]"),0===this.text.length)throw"style: "+name+" HTML is missing the: 'data-notify-text' attribute";return this.text.addClass(""+o+"Text")},t.prototype.show=function(t,n){var e,i,o,r;if(null==n&&(n=$.noop),r=this.container.parent().parents(":hidden").length>0,i=this.container.add(this.arrow),e=[],r&&t)o="show";else if(r&&!t)o="hide";else if(!r&&t)o=this.options.showAnimation,e.push(this.options.showDuration);else{if(r||t)return n();o=this.options.hideAnimation,e.push(this.options.hideDuration)}return e.push(n),i[o].apply(i,e)},t.prototype.updatePosition=function(){var t,n,i,o,r,s,a,p,u,f,w,y,g,v,C,S,k,R,H,B,I,X,z,D,T;if(this.elem){if(f=this.elem.position(),a=this.elem.outerHeight(),w=this.elem.outerWidth(),p=this.elem.innerHeight(),u=this.elem.innerWidth(),z=this.wrapper.position(),o=this.container.height(),r=this.container.width(),X=this.getPosition(),R=X[0],S=X[1],k=X[2]||S,y=m[R],v=c[R],C=m[v],s={},s[C]="b"===R?a:"r"===R?w:0,h(s,"left",f.left-z.left),g=parseInt(this.elem.css("margin-left"),10),g&&h(s,"left",g),/^inline/.test(this.elem.css("display"))&&(H=parseInt(this.elem.css("padding-top"),10),H&&h(s,"top",-H)),h(s,"top",this.options.offsetY),h(s,"left",this.options.offsetX),this.options.arrowShow){for(n=this.options.arrowSize,t=$.extend({},s),D=0,T=d.length;T>D;D++)B=d[D],I=m[B],B!==v&&(i=I===y?this.getColor():"transparent",t["border-"+I]=""+n+"px solid "+i);h(s,m[v],n),x.call(d,S)>=0&&h(t,m[S],2*n)}else this.arrow.hide();return x.call(b,R)>=0?(h(s,"left",A(S,r,w)),t&&h(t,"left",A(S,n,u))):x.call(l,R)>=0&&(h(s,"top",A(S,o,a)),t&&h(t,"top",A(S,n,p))),this.container.is(":visible")&&(s.display="block"),this.container.removeAttr("style").css(s),t?this.arrow.removeAttr("style").css(t):e}},t.prototype.getPosition=function(){var t,n,e,i,o,r,s,a;if(n=this.options.position,t=f(n),0===t.length&&(t[0]="b"),e=t[0],0>x.call(d,e))throw"Must be one of ["+d+"]";if((1===t.length||(i=t[0],x.call(b,i)>=0&&(o=t[1],0>x.call(l,o)))||(r=t[0],x.call(l,r)>=0&&(s=t[1],0>x.call(b,s))))&&(t[1]=(a=t[0],x.call(l,a)>=0?"m":"l")),!this.options.autoReposition)return t;throw"Not implemented"},t.prototype.getColor=function(){var t;return t=this.getStyle().colors,t&&t[this.options.color]||this.options.colors[this.options.color]||this.options.color},t.prototype.getStyle=function(t){var n;if(t||(t=this.options.style),t||(t="default"),n=g.user[t],!n)throw"Missing style: "+t;return n},t.prototype.updateStyle=function(){var t=this;return this.wrapper.find("[data-notify-style]").each(function(n,e){return $(e).attr("style",$(e).attr("data-notify-style").replace(/\{\{\s*color\s*\}\}/gi,t.getColor()))})},t.prototype.run=function(t,n){var i=this;return $.isPlainObject(n)?$.extend(this.options,n):"string"===$.type(n)&&(this.options.color=n),this.container&&!t?(this.show(!1),e):this.container||t?("string"===$.type(t)?this.text.html(t.replace("\n","
")):this.text.empty().append(t),this.updatePosition(),this.show(!0),this.options.autoHide?(clearTimeout(this.autohideTimer),this.autohideTimer=setTimeout(function(){return i.show(!1)},this.options.autoHideDelay)):e):e},t.prototype.destroy=function(){var t=this;return this.show(!1,function(){return t.wrapper.remove()})},t}(),$(function(){return $("body").append(r),$("link").each(function(){var t,n;return n=$(this).attr("href"),n.match(/bootstrap/)?(t=!0,!1):e}),u(g.core),$(n).on("click","."+o+"Wrapper",function(){var t;return(t=$(this).data(o))?t.elem?t.show(!1):t.destroy():e})}),$[w]=function(t,n,e){return t&&t.nodeName||t.jquery?$(t)[w](n,e):(e=n,n=t,new i(null,n,e)),t},$[w].options=function(t){return $.extend(y,t)},$[w].styles=function(t){return $.extend(!0,g.user,t)},$[w].insertCSS=u,$.fn[w]=function(t,n){return $(this).each(function(){var e;return e=a($(this)).data(o),e?e.run(t,n):new i($(this),t,n)}),this}})(window,document); \ No newline at end of file diff --git a/examples/position.html b/examples/position.html index 0f33ed7..9c2ebbf 100644 --- a/examples/position.html +++ b/examples/position.html @@ -33,7 +33,7 @@ boxes.append($("
").append(box)); setTimeout(function() { - box.notify(p, {position: p+" middle"}); + box.notify(p, {position: p+" center"}); }, 500) }); diff --git a/src/notify.coffee b/src/notify.coffee index 63b27c2..5716515 100644 --- a/src/notify.coffee +++ b/src/notify.coffee @@ -13,8 +13,8 @@ positions = l: 'left' c: 'center' r: 'right' -hPositions = ['l','c','r'] -vPositions = ['t','m','b'] +hAligns = ['l','c','r'] +vAligns = ['t','m','b'] mainPositions = ['t','b','l','r'] #positions mapped to opposites opposites = @@ -37,11 +37,20 @@ styles = core: html: """
-
""" + + #
+ + # .#{className}Debug { + # position: absolute; + # border: 3px solid red; + # height: 0; + # width: 0; + # } + css: """ .#{className}Corner { position: fixed; @@ -67,13 +76,6 @@ styles = width: 0; } - .#{className}Debug { - position: absolute; - border: 3px solid red; - height: 0; - width: 0; - } - .#{className}Container { display: none; z-index: 1; @@ -150,7 +152,7 @@ pluginOptions = # Default style style: 'default' # Default color - color: 'red' + color: 'black' # Color mappings colors: red: '#b94a48' @@ -313,13 +315,15 @@ class Notification elemPos = @elem.position() elemH = @elem.outerHeight() elemW = @elem.outerWidth() + elemIH = @elem.innerHeight() + elemIW = @elem.innerWidth() wrapPos = @wrapper.position() contH = @container.height() contW = @container.width() #get user defined position position = @getPosition() - console.log position + pMain = position[0] pAlign = position[1] pArrow = position[2] or pAlign @@ -353,43 +357,46 @@ class Notification if not @options.arrowShow @arrow.hide() else - size = @options.arrowSize + arrowSize = @options.arrowSize arrowCss = $.extend {}, css #build arrow for pos in mainPositions posFull = positions[pos] continue if pos is opp color = if posFull is mainFull then @getColor() else 'transparent' - arrowCss["border-#{posFull}"] = "#{size}px solid #{color}" + arrowCss["border-#{posFull}"] = "#{arrowSize}px solid #{color}" #add some room for the arrow - incr css, positions[opp], size - #add styles - @arrow.css(arrowCss).show() + incr css, positions[opp], arrowSize - #calculate alignment - if pMain in vPositions + incr arrowCss, positions[pAlign], arrowSize*2 if pAlign in mainPositions + + #calculate container alignment + if pMain in vAligns incr css, 'left', realign(pAlign, contW, elemW) - if pMain in hPositions + incr arrowCss, 'left', realign(pAlign, arrowSize, elemIW) if arrowCss + else if pMain in hAligns incr css, 'top', realign(pAlign, contH, elemH) + incr arrowCss, 'top', realign(pAlign, arrowSize, elemIH) if arrowCss #apply css css.display = 'block' if @container.is(":visible") @container.removeAttr('style').css css + @arrow.removeAttr('style').css(arrowCss) if arrowCss getPosition: -> text = @options.position pos = parsePosition text - #if unspecified - choose bottom left + #validate position pos[0] = 'b' if pos.length is 0 - if pos[0] not in mainPositions throw "Must be one of [#{mainPositions}]" - + + #validate alignment 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) - pos[1] = if pos[0] in hPositions then 'm' else 'l' + (pos[0] in vAligns and pos[1] not in hAligns) or + (pos[0] in hAligns and pos[1] not in vAligns) + pos[1] = if pos[0] in hAligns then 'm' else 'l' unless @options.autoReposition return pos @@ -397,7 +404,6 @@ class Notification # if @elem.position().left + @elem.width() + @wrapper.width() < $(window).width() # return 'right' # return 'bottom' - throw "Not implemented" getColor: ->