pull in some small changes from private

This commit is contained in:
Tyler Renelle
2012-11-14 17:46:22 -05:00
parent fb1fc7eb80
commit 0088ea516b
5 changed files with 5 additions and 3 deletions
+1
View File
@@ -0,0 +1 @@
google-site-verification: google280633b772b94345.html
+1
View File
@@ -0,0 +1 @@
google-site-verification: google8ca65b6ff3506fb8.html
+1 -1
View File
@@ -1,2 +1,2 @@
/* https://github.com/ifightcrime/bootstrap-growl */
(function(e){e.bootstrapGrowl=function(t,n){var n=e.extend({},e.bootstrapGrowl.default_options,n),r=e("<div>");r.attr("class","bootstrap-growl alert"),n.type&&r.addClass("alert-"+n.type),n.allow_dismiss&&r.append('<a class="close" data-dismiss="alert" href="#">&times;</a>'),r.append(t);var i=n.top_offset,s=e(".bootstrap-growl",n.ele);e.each(s,function(){i=i+e(this).outerHeight()+n.stackup_spacing}),r.css({position:"absolute",top:i+"px",border:"1px solid "+r.css("color"),margin:0,"z-index":"9999",display:"none"}),n.width!=="auto"&&r.css("width",n.width+"px"),e(n.ele).append(r);switch(n.align){case"center":r.css({left:"50%","margin-left":"-"+r.outerWidth()/2+"px"});break;case"left":r.css("left","20px");break;default:r.css("right","20px")}r.fadeIn().delay(n.delay).fadeOut("slow",function(){e(this).remove()})},e.bootstrapGrowl.default_options={ele:"body",type:null,top_offset:20,align:"right",width:250,delay:4e3,allow_dismiss:!0,stackup_spacing:10}})(jQuery);
(function(e){e.bootstrapGrowl=function(t,n){var n=e.extend({},e.bootstrapGrowl.default_options,n),r=e("<div>");r.attr("class","bootstrap-growl alert"),n.type&&r.addClass("alert-"+n.type),n.allow_dismiss&&r.append('<a class="close" data-dismiss="alert" href="#">&times;</a>'),r.append(t);var i=n.top_offset,s=e(".bootstrap-growl",n.ele);e.each(s,function(){i=i+e(this).outerHeight()+n.stackup_spacing}),r.css({position:"absolute",top:i+"px",border:"1px solid "+r.css("color"),margin:0,"z-index":"9999",display:"none"}),n.width!=="auto"&&r.css("width",n.width+"px"),e(n.ele).append(r);switch(n.align){case"center":r.css({left:"50%","margin-left":"-"+r.outerWidth()/2+"px"});break;case"left":r.css("left","20px");break;default:r.css("right","20px")}r.fadeIn(),n.delay>=0&&r.delay(n.delay).fadeOut("slow",function(){e(this).remove()})},e.bootstrapGrowl.default_options={ele:"body",type:null,top_offset:20,align:"right",width:250,delay:4e3,allow_dismiss:!0,stackup_spacing:10}})(jQuery);
+1 -1
View File
@@ -11,7 +11,7 @@ model = undefined
setModel = (m) ->
model = m
user = model.at('_user')
setupNotifications()
setupNotifications() unless model.get('_mobileDevice')
setupNotifications = ->
return unless jQuery? # Only run this in the browser
+1 -1
View File
@@ -46,7 +46,7 @@ module.exports = (expressApp, root, derby) ->
model.at('_habitList').push {
id: taskId
type: 'habit'
text: (title || taskId) + ' *'
text: (title || taskId)
value: 0
up: true
down: true