Skip to content

Commit

Permalink
update bower dependencies, install ckeditor over bower, move husky th…
Browse files Browse the repository at this point in the history
…eme to husky_components ckeditor
  • Loading branch information
alexander-schranz committed Feb 23, 2015
1 parent 8b85ca6 commit 6095630
Show file tree
Hide file tree
Showing 2,688 changed files with 25,090 additions and 12,669 deletions.
4 changes: 2 additions & 2 deletions .grunt/husky.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"tagsManager": "bower_components/tagmanager/tagmanager",
"dropzone": "bower_components/dropzone/dropzone",
"uri-template": "bower_components/massiveart-uritemplate/uritemplate",
"ckeditor" : "vendor/ckeditor/ckeditor",
"jqueryAdapter" : "vendor/ckeditor/adapters/jquery",
"ckeditor" : "bower_components/ckeditor/ckeditor",
"jqueryAdapter" : "bower_components/ckeditor/adapters/jquery",
"jquery-minicolors" : "bower_components/jquery-minicolors/jquery.minicolors",
"husky": "lib/husky",
"type/husky-select": "husky_components/select/select-type",
Expand Down
8 changes: 7 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ module.exports = function(grunt) {
dest: 'dist',
src: [
'fonts/{,*/}*',
'vendor/ckeditor/{,**/}*',
'vendor/jquery.minicolors.png',
'scss/variables.scss',
'scss/mixins.scss'
Expand Down Expand Up @@ -318,6 +317,13 @@ module.exports = function(grunt) {
cwd: '.bower_components/bootstrap-datepicker/js/',
src: ['**'],
dest: 'bower_components/bootstrap-datepicker/'
},
// ckeditor
{
expand: true,
cwd: '.bower_components/ckeditor',
src: ['**'],
dest: 'bower_components/ckeditor'
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"requirejs": "2.1.9",
"dropzone": "3.9.*",
"jquery-minicolors": "~2.1.6",
"bootstrap-datepicker": "~1.3.0"
"bootstrap-datepicker": "~1.3.0",
"ckeditor": "4"
},
"resolutions": {
"jquery": "~1.10.x"
Expand Down
24 changes: 17 additions & 7 deletions bower_components/bootstrap-datepicker/bootstrap-datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
this.push.apply(this, new_array);
},
clear: function(){
this.splice(0);
this.length = 0;
},
copy: function(){
var a = new DateArray();
Expand Down Expand Up @@ -116,7 +116,7 @@
this.viewMode = this.o.startView;

if (this.o.calendarWeeks)
this.picker.find('tfoot th.today')
this.picker.find('tfoot th.today, tfoot th.clear')
.attr('colspan', function(i, val){
return parseInt(val) + 1;
});
Expand Down Expand Up @@ -547,9 +547,12 @@
windowHeight = $window.height(),
scrollTop = $window.scrollTop();

var zIndex = parseInt(this.element.parents().filter(function(){
return $(this).css('z-index') !== 'auto';
}).first().css('z-index'))+10;
var parentsZindex = [];
this.element.parents().each(function() {
var itemZIndex = $(this).css('z-index');
if ( itemZIndex !== 'auto' && itemZIndex !== 0 ) parentsZindex.push( parseInt( itemZIndex ) );
});
var zIndex = Math.max.apply( Math, parentsZindex ) + 10;
var offset = this.component ? this.component.parent().offset() : this.element.offset();
var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false);
var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false);
Expand Down Expand Up @@ -745,6 +748,7 @@
todaytxt = dates[this.o.language].today || dates['en'].today || '',
cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
tooltip;
if (isNaN(year) || isNaN(month)) return;
this.picker.find('.datepicker-days thead th.datepicker-switch')
.text(dates[this.o.language].months[month]+' '+year);
this.picker.find('tfoot th.today')
Expand Down Expand Up @@ -804,6 +808,7 @@

clsName = $.unique(clsName);
html.push('<td class="'+clsName.join(' ')+'"' + (tooltip ? ' title="'+tooltip+'"' : '') + '>'+prevMonth.getUTCDate() + '</td>');
tooltip = null;
if (prevMonth.getUTCDay() === this.o.weekEnd){
html.push('</tr>');
}
Expand Down Expand Up @@ -1017,6 +1022,9 @@
if (!date){
this.dates.clear();
}
if (this.o.multidate === 1 && ix === 0){
// single datepicker, don't remove selected date
}
else if (ix !== -1){
this.dates.remove(ix);
}
Expand Down Expand Up @@ -1192,8 +1200,10 @@
break;
case 13: // enter
focusDate = this.focusDate || this.dates.get(-1) || this.viewDate;
this._toggle_multidate(focusDate);
dateChanged = true;
if (this.o.keyboardNavigation) {
this._toggle_multidate(focusDate);
dateChanged = true;
}
this.focusDate = null;
this.viewDate = this.dates.get(-1) || this.viewDate;
this.setValue();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Bosnian translation for bootstrap-datepicker
*/
;(function($){
$.fn.datepicker.dates['bs'] = {
days: ["Nedjelja","Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota", "Nedjelja"],
daysShort: ["Ned", "Pon", "Uto", "Sri", "Čet", "Pet", "Sub", "Ned"],
daysMin: ["N", "Po", "U", "Sr", "Č", "Pe", "Su", "N"],
months: ["Januar", "Februar", "Mart", "April", "Maj", "Juni", "Juli", "August", "Septembar", "Oktobar", "Novembar", "Decembar"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
today: "Danas",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
daysMin: ["dg", "dl", "dt", "dc", "dj", "dv", "ds", "dg"],
months: ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"],
monthsShort: ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"],
today: "Avui"
today: "Avui",
clear: "Esborrar",
weekStart: 1,
format: "dd/mm/yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
daysMin: ["Ne", "Po", "Út", "St", "Čt", "Pá", "So", "Ne"],
months: ["Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec"],
monthsShort: ["Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čnc", "Srp", "Zář", "Říj", "Lis", "Pro"],
today: "Dnes"
today: "Dnes",
clear: "Vymazat",
weekStart: 1,
format: "d.m.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
daysMin: ["Κυ", "Δε", "Τρ", "Τε", "Πε", "Πα", "Σα", "Κυ"],
months: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"],
monthsShort: ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μάι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"],
today: "Σήμερα"
today: "Σήμερα",
clear: "Καθαρισμός",
weekStart: 1,
format: "d/m/yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* British English translation for bootstrap-datepicker
* Xavier Dutreilh <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['en-GB'] = {
days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
today: "Today",
clear: "Clear",
weekStart: 1,
format: "dd/mm/yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
daysMin: ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa", "Do"],
months: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"],
monthsShort: ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
today: "Hoy"
today: "Hoy",
clear: "Borrar",
weekStart: 1,
format: "dd/mm/yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Basque translation for bootstrap-datepicker
* Arkaitz Etxeberria <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['eu'] = {
days: ['Igandea','Astelehena','Asteartea','Asteazkena','Osteguna','Ostirala','Larunbata','Igandea'],
daysShort: ['Ig','Al','Ar','Az','Og','Ol','Lr', 'Ig'],
daysMin: ['Ig','Al','Ar','Az','Og','Ol','Lr', 'Ig'],
months: ['Urtarrila','Otsaila','Martxoa','Apirila','Maiatza','Ekaina','Uztaila','Abuztua','Iraila','Urria','Azaroa','Abendua'],
monthsShort: ['Urt','Ots','Mar','Api','Mai','Eka','Uzt','Abu','Ira','Urr','Aza','Abe'],
today: "Gaur"
};
}(jQuery));

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Faroese translation for bootstrap-datepicker
* Theodor Johannesen <http://github.com/theodorjohannesen>
*/
;(function($){
$.fn.datepicker.dates['fo'] = {
days: ["Sunnudagur", "Mánadagur", "Týsdagur", "Mikudagur", "Hósdagur", "Fríggjadagur", "Leygardagur", "Sunnudagur"],
daysShort: ["Sun", "Mán", "Týs", "Mik", "Hós", "Frí", "Ley", "Sun"],
daysMin: ["Su", "Má", "Tý", "Mi", "Hó", "Fr", "Le", "Su"],
months: ["Januar", "Februar", "Marts", "Apríl", "Mei", "Juni", "Juli", "August", "Septembur", "Oktobur", "Novembur", "Desembur"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"],
today: "Í Dag",
clear: "Reinsa"
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* French (Switzerland) translation for bootstrap-datepicker
* Christoph Jossi <[email protected]>
* Based on
* French translation for bootstrap-datepicker
* Nico Mollet <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['fr'] = {
days: ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"],
daysShort: ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"],
daysMin: ["D", "L", "Ma", "Me", "J", "V", "S", "D"],
months: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
monthsShort: ["Jan", "Fév", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Déc"],
today: "Aujourd'hui",
clear: "Effacer",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
months: ["Xaneiro", "Febreiro", "Marzo", "Abril", "Maio", "Xuño", "Xullo", "Agosto", "Setembro", "Outubro", "Novembro", "Decembro"],
monthsShort: ["Xan", "Feb", "Mar", "Abr", "Mai", "Xun", "Xul", "Ago", "Sep", "Out", "Nov", "Dec"],
today: "Hoxe",
clear: "Limpar"
clear: "Limpar",
weekStart: 1,
format: "dd/mm/yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* Armenian translation for bootstrap-datepicker
* Hayk Chamyan <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['hy'] = {
days: ["Կիրակի", "Երկուշաբթի", "Երեքշաբթի", "Չորեքշաբթի", "Հինգշաբթի", "Ուրբաթ", "Շաբաթ", "Կիրակի"],
daysShort: ["Կիր", "Երկ", "Երք", "Չոր", "Հնգ", "Ուր", "Շաբ", "Կիր"],
daysMin: ["Կի", "Եկ", "Եք", "Չո", "Հի", "Ու", "Շա", "Կի"],
months: ["Հունվար", "Փետրվար", "Մարտ", "Ապրիլ", "Մայիս", "Հունիս", "Հուլիս", "Օգոստոս", "Սեպտեմբեր", "Հոկտեմբեր", "Նոյեմբեր", "Դեկտեմբեր"],
monthsShort: ["Հնվ", "Փետ", "Մար", "Ապր", "Մայ", "Հուն", "Հուլ", "Օգս", "Սեպ", "Հոկ", "Նոյ", "Դեկ"],
today: "Այսօր",
clear: "Ջնջել",
format: "dd.mm.yyyy",
weekStart: 1
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* Italian (Switzerland) translation for bootstrap-datepicker
* Christoph Jossi <[email protected]>
* Based on
* Italian translation for bootstrap-datepicker
* Enrico Rubboli <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['it'] = {
days: ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato", "Domenica"],
daysShort: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab", "Dom"],
daysMin: ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"],
months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
monthsShort: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
today: "Oggi",
clear: "Cancella",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
months: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
monthsShort: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
today: "今日",
format: "yyyy/mm/dd"
format: "yyyy/mm/dd",
clear: "クリア"
};
}(jQuery));
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Cambodia (Khmer) translation for bootstrap-datepicker
* Lytay TOUCH <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['kh'] = {
days: ["អាទិត្យ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រហស្បតិ៍", "សុក្រ", "សៅរ៍", "អាទិត្យ"],
daysShort: ["អា.ទិ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រ.ហ", "សុក្រ", "សៅរ៍", "អារ.ទិ"],
daysMin: ["អា.ទិ", "ចន្ទ", "អង្គារ", "ពុធ", "ព្រ.ហ", "សុក្រ", "សៅរ៍", "អារ.ទិ"],
months: ["មករា", "កុម្ភះ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឆិកា", "ធ្នូ"],
monthsShort: ["មករា", "កុម្ភះ", "មិនា", "មេសា", "ឧសភា", "មិថុនា", "កក្កដា", "សីហា", "កញ្ញា", "តុលា", "វិច្ឆិកា", "ធ្នូ"],
today: "ថ្ងៃនេះ",
clear: "សំអាត"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
daysMin: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zo"],
months: ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"],
monthsShort: ["Jan", "Feb", "Mrt", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
today: "Vandaag"
today: "Vandaag",
clear: "Wissen",
weekStart: 1,
format: "dd-mm-yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
months: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"],
monthsShort: ["Sty", "Lu", "Mar", "Kw", "Maj", "Cze", "Lip", "Sie", "Wrz", "Pa", "Lis", "Gru"],
today: "Dzisiaj",
weekStart: 1
weekStart: 1,
clear: "Wyczyść"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
daysMin: ["N", "Po", "U", "Sr", "Č", "Pe", "Su", "N"],
months: ["Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
today: "Danas"
today: "Danas",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
daysMin: ["Н", "По", "У", "Ср", "Ч", "Пе", "Су", "Н"],
months: ["Јануар", "Фебруар", "Март", "Април", "Мај", "Јун", "Јул", "Август", "Септембар", "Октобар", "Новембар", "Децембар"],
monthsShort: ["Јан", "Феб", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Нов", "Дец"],
today: "Данас"
today: "Данас",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
months: ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"],
monthsShort: ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"],
today: "Сегодня",
clear: "Очистить",
format: "dd.mm.yyyy",
weekStart: 1
};
}(jQuery));
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
;(function($){
$.fn.datepicker.dates['sq'] = {
days: ["E Diel", "E Hënë", "E martē", "E mërkurë", "E Enjte", "E Premte", "E Shtunë", "E Diel"],
days: ["E Diel", "E Hënë", "E Martē", "E Mërkurë", "E Enjte", "E Premte", "E Shtunë", "E Diel"],
daysShort: ["Die", "Hën", "Mar", "Mër", "Enj", "Pre", "Shtu", "Die"],
daysMin: ["Di", "Hë", "Ma", "Më", "En", "Pr", "Sht", "Di"],
months: ["Janar", "Shkurt", "Mars", "Prill", "Maj", "Qershor", "Korrik", "Gusht", "Shtator", "Tetor", "Nëntor", "Dhjetor"],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* Serbian latin translation for bootstrap-datepicker
* Bojan Milosavlević <[email protected]>
*/
;(function($){
$.fn.datepicker.dates['sr-latin'] = {
days: ["Nedelja","Ponedeljak", "Utorak", "Sreda", "Četvrtak", "Petak", "Subota", "Nedelja"],
daysShort: ["Ned", "Pon", "Uto", "Sre", "Čet", "Pet", "Sub", "Ned"],
daysMin: ["N", "Po", "U", "Sr", "Č", "Pe", "Su", "N"],
months: ["Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
today: "Danas",
weekStart: 1,
format: "dd.mm.yyyy"
};
}(jQuery));
Loading

0 comments on commit 6095630

Please sign in to comment.