From f25a53c3b6debe970052949ea8497f8344faa0b4 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 16 Feb 2013 20:01:59 -0500 Subject: [PATCH] more submodules, including only using sortablef or jquery-ui --- .gitmodules | 6 ++++ public/vendor/google-jsapi.js | 39 ---------------------- public/vendor/jquery-cookie | 1 + public/vendor/jquery-ui | 1 + public/vendor/jquery.cookie.js | 61 ---------------------------------- src/app/browser.coffee | 12 +++++-- 6 files changed, 17 insertions(+), 103 deletions(-) delete mode 100644 public/vendor/google-jsapi.js create mode 160000 public/vendor/jquery-cookie create mode 160000 public/vendor/jquery-ui delete mode 100644 public/vendor/jquery.cookie.js diff --git a/.gitmodules b/.gitmodules index e074353db1..38c8f969fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "public/vendor/github-buttons"] path = public/vendor/github-buttons url = https://github.com/mdo/github-buttons.git +[submodule "public/vendor/jquery-cookie"] + path = public/vendor/jquery-cookie + url = https://github.com/carhartl/jquery-cookie.git +[submodule "public/vendor/jquery-ui"] + path = public/vendor/jquery-ui + url = https://github.com/jquery/jquery-ui.git diff --git a/public/vendor/google-jsapi.js b/public/vendor/google-jsapi.js deleted file mode 100644 index d24cc72676..0000000000 --- a/public/vendor/google-jsapi.js +++ /dev/null @@ -1,39 +0,0 @@ -if(!window['googleLT_']){window['googleLT_']=(new Date()).getTime();}if (!window['google']) { -window['google'] = {}; -} -if (!window['google']['loader']) { -window['google']['loader'] = {}; -google.loader.ServiceBase = 'https://www.google.com/uds'; -google.loader.GoogleApisBase = 'https://ajax.googleapis.com/ajax'; -google.loader.ApiKey = 'notsupplied'; -google.loader.KeyVerified = true; -google.loader.LoadFailure = false; -google.loader.Secure = true; -google.loader.GoogleLocale = 'www.google.com'; -google.loader.ClientLocation = null; -google.loader.AdditionalParams = ''; -(function() {var d=void 0,g=!0,h=null,j=!1,k=encodeURIComponent,l=window,m=document;function n(a,b){return a.load=b}var p="push",q="replace",r="charAt",t="indexOf",u="ServiceBase",v="name",w="getTime",x="length",y="prototype",z="setTimeout",A="loader",B="substring",C="join",D="toLowerCase";function E(a){return a in F?F[a]:F[a]=-1!=navigator.userAgent[D]()[t](a)}var F={};function G(a,b){var c=function(){};c.prototype=b[y];a.T=b[y];a.prototype=new c} -function H(a,b,c){var e=Array[y].slice.call(arguments,2)||[];return function(){var c=e.concat(Array[y].slice.call(arguments));return a.apply(b,c)}}function I(a){a=Error(a);a.toString=function(){return this.message};return a}function J(a,b){for(var c=a.split(/\./),e=l,f=0;f<\/script>"):(E("safari")||E("konqueror"))&&l[z](T,10)),P[p](a)):Q(l,"load",a)};L("google.setOnLoadCallback",google.S); -function Q(a,b,c){if(a.addEventListener)a.addEventListener(b,c,j);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var e=a["on"+b];a["on"+b]=e!=h?aa([c,e]):c}}function aa(a){return function(){for(var b=0;b<\/script>'):"css"==a&&m.write('')}; -L("google.loader.writeLoadTag",google[A].d);google[A].P=function(a){O=a};L("google.loader.rfm",google[A].P);google[A].R=function(a){for(var b in a)"string"==typeof b&&(b&&":"==b[r](0)&&!N[b])&&(N[b]=new U(b[B](1),a[b]))};L("google.loader.rpl",google[A].R);google[A].Q=function(a){if((a=a.specs)&&a[x])for(var b=0;b 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value == null)) { - options = $.extend({}, $.cookie.defaults, options); - - if (value == null) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || $.cookie.defaults || {}; - var decode = options.raw ? raw : decoded; - var cookies = document.cookie.split('; '); - for (var i = 0, parts; (parts = cookies[i] && cookies[i].split('=')); i++) { - if (decode(parts.shift()) === key) { - return decode(parts.join('=')); - } - } - return null; - }; - - $.cookie.defaults = {}; - -})(jQuery, document); diff --git a/src/app/browser.coffee b/src/app/browser.coffee index b953d401f3..632a2b043d 100644 --- a/src/app/browser.coffee +++ b/src/app/browser.coffee @@ -32,8 +32,14 @@ module.exports.app = (appExports, model) -> ### loadJavaScripts = (model) -> - require '../../public/vendor/jquery.min' - require '../../public/vendor/jquery-ui.min' unless model.get('_view.mobileDevice') + require '../../public/vendor/jquery-ui/jquery-1.9.1' + unless model.get('_view.mobileDevice') + require '../../public/vendor/jquery-ui/ui/jquery.ui.core' + require '../../public/vendor/jquery-ui/ui/jquery.ui.widget' + require '../../public/vendor/jquery-ui/ui/jquery.ui.mouse' + require '../../public/vendor/jquery-ui/ui/jquery.ui.draggable' + require '../../public/vendor/jquery-ui/ui/jquery.ui.position' + require '../../public/vendor/jquery-ui/ui/jquery.ui.sortable' # Bootstrap require '../../public/vendor/bootstrap/js/bootstrap-tooltip' @@ -43,7 +49,7 @@ loadJavaScripts = (model) -> 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/jquery-cookie/jquery.cookie' 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/vendor/bootstrap-growl/jquery.bootstrap-growl.min'