move all public/js to public/vendor, move bootstrap & bootstrap-growl to git submodule

This commit is contained in:
Tyler Renelle 2013-02-16 19:42:35 -05:00
parent 8ca41e2b99
commit d03352c323
12 changed files with 23 additions and 22 deletions

6
.gitmodules vendored
View file

@ -1,3 +1,9 @@
[submodule "public/vendor/bootstrap-datepicker"]
path = public/vendor/bootstrap-datepicker
url = https://github.com/eternicode/bootstrap-datepicker.git
[submodule "public/vendor/bootstrap-growl"]
path = public/vendor/bootstrap-growl
url = https://github.com/ifightcrime/bootstrap-growl.git
[submodule "public/vendor/bootstrap"]
path = public/vendor/bootstrap
url = https://github.com/twitter/bootstrap.git

File diff suppressed because one or more lines are too long

View file

@ -1,2 +0,0 @@
/* https://github.com/ifightcrime/bootstrap-growl */
(function(e){e.bootstrapGrowl=function(t,n){var n=e.extend({},e.bootstrapGrowl.default_options,n);var r=e("<div>");r.attr("class","bootstrap-growl alert");if(n.type){r.addClass("alert-"+n.type)}if(n.allow_dismiss){r.append('<a class="close" data-dismiss="alert" href="#">×</a>')}r.append(t);if(n.top_offset){n.offset={from:"top",amount:n.top_offset}}var i=e(".bootstrap-growl",n.ele);offsetAmount=n.offset.amount;e.each(i,function(){offsetAmount=offsetAmount+e(this).outerHeight()+n.stackup_spacing});css={position:"absolute",border:"1px solid "+r.css("color"),margin:0,"z-index":"9999",display:"none"};css[n.offset.from]=offsetAmount+"px";r.css(css);if(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();if(n.delay>=0){r.delay(n.delay).fadeOut("slow",function(){e(this).remove()})}};e.bootstrapGrowl.default_options={ele:"body",type:null,offset:{from:"top",amount:20},align:"right",width:250,delay:4e3,allow_dismiss:true,stackup_spacing:10}})(jQuery)

File diff suppressed because one or more lines are too long

1
public/vendor/bootstrap vendored Submodule

@ -0,0 +1 @@
Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33

1
public/vendor/bootstrap-growl vendored Submodule

@ -0,0 +1 @@
Subproject commit c033de329bb1b21e4175e2a53efd844b664d27c8

View file

@ -32,15 +32,22 @@ module.exports.app = (appExports, model) ->
###
loadJavaScripts = (model) ->
# Load public/js/* files
# TODO use Bower
require '../../public/js/jquery.min'
require '../../public/js/jquery-ui.min' unless model.get('_view.mobileDevice')
require '../../public/js/bootstrap.min' #http://twitter.github.com/bootstrap/assets/js/bootstrap.min.js
require '../../public/js/jquery.cookie' #https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js
require '../../public/js/bootstrap-tour' #https://raw.github.com/pushly/bootstrap-tour/master/bootstrap-tour.js
require '../../public/vendor/jquery.min'
require '../../public/vendor/jquery-ui.min' unless model.get('_view.mobileDevice')
# Bootstrap
require '../../public/vendor/bootstrap/js/bootstrap-tooltip'
require '../../public/vendor/bootstrap/js/bootstrap-tab'
require '../../public/vendor/bootstrap/js/bootstrap-popover'
require '../../public/vendor/bootstrap/js/bootstrap-modal'
require '../../public/vendor/bootstrap/js/bootstrap-dropdown'
require '../../public/vendor/jquery.cookie' #https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js
require '../../public/vendor/bootstrap-tour' #https://raw.github.com/pushly/bootstrap-tour/master/bootstrap-tour.js
require '../../public/vendor/bootstrap-datepicker/js/bootstrap-datepicker'
require '../../public/js/jquery.bootstrap-growl.min'
require '../../public/vendor/bootstrap-growl/jquery.bootstrap-growl.min'
# JS files not needed right away (google charts) or entirely optional (analytics)
# Each file getsload asyncronously via $.getScript, so it doesn't bog page-load