Skip to content

Commit

Permalink
prepare release
Browse files Browse the repository at this point in the history
  • Loading branch information
Lausselloic committed Jul 29, 2016
1 parent c623192 commit e5f1ca4
Show file tree
Hide file tree
Showing 22 changed files with 96 additions and 149 deletions.
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ grid:
subdesc: Desktop (≥1380px) (target 1440 screen resolutions)
# end boosted mod
# Custom vars
current_version: 4.0.0-alpha.3
current_version: 4.0.0-alpha.3.1
repo: https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap
slack: https://bootstrap-slack.herokuapp.com

download:
source: https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.0.0-alpha.3.zip
dist: https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/download/v4.0.0-alpha.3/boosted-4.0.0-alpha.3-dist.zip
source: https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v4.0.0-alpha.3.1.zip
dist: https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/download/v4.0.0-alpha.3/boosted-4.0.0-alpha.3.1-dist.zip

blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
"author": {
"name": "Orange SA"
},
"version": "4.0.0-alpha.3"
"version": "4.0.0-alpha.3.1"
}
8 changes: 7 additions & 1 deletion dist/css/boosted-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/boosted-rtl.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/boosted-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/boosted-rtl.min.css.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/css/boosted.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/boosted.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/boosted.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/boosted.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/boosted.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/boosted.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 28 additions & 60 deletions dist/js/vendors/jquery.tablesorter.combined.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tablesorter (FORK) - updated 04-29-2016 (v2.25.9)*/
/*! tablesorter (FORK) - updated 03-18-2016 (v2.25.6)*/
/* Includes widgets ( storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort ) */
(function(factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -10,7 +10,7 @@
}
}(function($) {

/*! TableSorter (FORK) v2.25.9 *//*
/*! TableSorter (FORK) v2.25.6 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -33,7 +33,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.25.9',
version : '2.25.6',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -953,15 +953,8 @@
index = 0;
while ( index <= span ) {
// duplicate text (or not) to spanned columns
// instead of setting duplicate span to empty string, use textExtraction to try to get a value
// see http://stackoverflow.com/q/36449711/145346
txt = c.duplicateSpan || index === 0 ?
val :
typeof c.textExtraction !== 'string' ?
ts.getElementText( c, cell, cacheIndex + index ) || '' :
'';
rowData.raw[ cacheIndex + index ] = txt;
cols[ cacheIndex + index ] = txt;
rowData.raw[ cacheIndex + index ] = c.duplicateSpan || index === 0 ? val : '';
cols[ cacheIndex + index ] = c.duplicateSpan || index === 0 ? val : '';
index++;
}
cacheIndex += span;
Expand Down Expand Up @@ -3098,7 +3091,7 @@

})(jQuery);

/*! Widget: filter - updated 4/29/2016 (v2.25.9) *//*
/*! Widget: filter - updated 3/18/2016 (v2.25.6) *//*
* Requires tablesorter v2.8+ and jQuery 1.7+
* by Rob Garrison
*/
Expand Down Expand Up @@ -3177,7 +3170,6 @@
.unbind( events.replace( ts.regex.spaces, ' ' ) )
// remove the filter row even if refreshing, because the column might have been moved
.find( '.' + tscss.filterRow ).remove();
wo.filter_initialized = false;
if ( refreshing ) { return; }
for ( tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
$tbody = ts.processTbody( table, $tbodies.eq( tbodyIndex ), true ); // remove tbody
Expand Down Expand Up @@ -3450,17 +3442,15 @@
return null;
}
},
init: function( table ) {
init: function( table, c, wo ) {
// filter language options
ts.language = $.extend( true, {}, {
to : 'to',
or : 'or',
and : 'and'
}, ts.language );

var options, string, txt, $header, column, val, fxn, noSelect,
c = table.config,
wo = c.widgetOptions;
var options, string, txt, $header, column, filters, val, fxn, noSelect;
c.$table.addClass( 'hasFilters' );
c.lastSearch = [];

Expand Down Expand Up @@ -3648,38 +3638,31 @@
c.$table
.unbind( txt.replace( ts.regex.spaces, ' ' ) )
.bind( txt, function() {
tsf.completeInit( this );
// redefine 'wo' as it does not update properly inside this callback
var wo = this.config.widgetOptions;
filters = tsf.setDefaults( table, c, wo ) || [];
if ( filters.length ) {
// prevent delayInit from triggering a cache build if filters are empty
if ( !( c.delayInit && filters.join( '' ) === '' ) ) {
ts.setFilters( table, filters, true );
}
}
c.$table.triggerHandler( 'filterFomatterUpdate' );
// trigger init after setTimeout to prevent multiple filterStart/End/Init triggers
setTimeout( function() {
if ( !wo.filter_initialized ) {
tsf.filterInitComplete( c );
}
}, 100 );
});
// if filter widget is added after pager has initialized; then set filter init flag
if ( c.pager && c.pager.initialized && !wo.filter_initialized ) {
c.$table.triggerHandler( 'filterFomatterUpdate' );
setTimeout( function() {
tsf.filterInitComplete( c );
}, 100 );
} else if ( !wo.filter_initialized ) {
tsf.completeInit( table );
}
},
completeInit: function( table ) {
// redefine 'c' & 'wo' so they update properly inside this callback
var c = table.config,
wo = c.widgetOptions,
filters = tsf.setDefaults( table, c, wo ) || [];
if ( filters.length ) {
// prevent delayInit from triggering a cache build if filters are empty
if ( !( c.delayInit && filters.join( '' ) === '' ) ) {
ts.setFilters( table, filters, true );
}
}
c.$table.triggerHandler( 'filterFomatterUpdate' );
// trigger init after setTimeout to prevent multiple filterStart/End/Init triggers
setTimeout( function() {
if ( !wo.filter_initialized ) {
tsf.filterInitComplete( c );
}
}, 100 );
},

// $cell parameter, but not the config, is passed to the filter_formatters,
// so we have to work with it instead
formatterUpdated: function( $cell, column ) {
Expand Down Expand Up @@ -4144,7 +4127,6 @@
},
matchType: function( c, columnIndex ) {
var isMatch,
wo = c.widgetOptions,
$el = c.$headerIndexed[ columnIndex ];
// filter-exact > filter-match > filter_matchType for type
if ( $el.hasClass( 'filter-exact' ) ) {
Expand All @@ -4153,14 +4135,7 @@
isMatch = true;
} else {
// filter-select is not applied when filter_functions are used, so look for a select
if ( wo.filter_columnFilters ) {
$el = c.$filters
.find( '.' + tscss.filter )
.add( wo.filter_$externalFilters )
.filter( '[data-column="' + columnIndex + '"]' );
} else if ( wo.filter_$externalFilters ) {
$el = wo.filter_$externalFilters.filter( '[data-column="' + columnIndex + '"]' );
}
$el = c.$filters.eq( columnIndex ).find( '.' + tscss.filter );
isMatch = $el.length ?
c.widgetOptions.filter_matchType[ ( $el[ 0 ].nodeName || '' ).toLowerCase() ] === 'match' :
// default to exact, if no inputs found
Expand Down Expand Up @@ -4251,7 +4226,7 @@

// in case select filter option has a different value vs text 'a - z|A through Z'
ffxn = wo.filter_columnFilters ?
c.$filters.add( wo.filter_$externalFilters )
c.$filters.add( c.$externalFilters )
.filter( '[data-column="' + columnIndex + '"]' )
.find( 'select option:selected' )
.attr( 'data-function-name' ) || '' : '';
Expand Down Expand Up @@ -4925,7 +4900,7 @@

})( jQuery );

/*! Widget: stickyHeaders - updated 4/1/2016 (v2.25.7) *//*
/*! Widget: stickyHeaders - updated 3/1/2016 (v2.25.5) *//*
* Requires tablesorter v2.8+ and jQuery 1.4.3+
* by Rob Garrison
*/
Expand Down Expand Up @@ -5193,21 +5168,14 @@
}
}

// resize table (Firefox)
if (wo.stickyHeaders_addResizeEvent) {
$table.bind('resize' + c.namespace + 'stickyheaders', function() {
resizeHeader();
});
}

$table.triggerHandler('stickyHeadersInit');

},
remove: function(table, c, wo) {
var namespace = c.namespace + 'stickyheaders ';
c.$table
.removeClass('hasStickyHeaders')
.unbind( ('pagerComplete resize filterEnd stickyHeadersUpdate '.split(' ').join(namespace)).replace(/\s+/g, ' ') )
.unbind( ('pagerComplete filterEnd stickyHeadersUpdate '.split(' ').join(namespace)).replace(/\s+/g, ' ') )
.next('.' + ts.css.stickyWrap).remove();
if (wo.$sticky && wo.$sticky.length) { wo.$sticky.remove(); } // remove cloned table
$(window)
Expand Down
8 changes: 4 additions & 4 deletions dist/js/vendors/jquery.tablesorter.combined.min.js

Large diffs are not rendered by default.

15 changes: 4 additions & 11 deletions dist/js/vendors/jquery.tablesorter.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
}(function($) {

/*! TableSorter (FORK) v2.25.9 *//*
/*! TableSorter (FORK) v2.25.6 *//*
* Client-side table sorting with ease!
* @requires jQuery v1.2.6+
*
Expand All @@ -31,7 +31,7 @@
'use strict';
var ts = $.tablesorter = {

version : '2.25.9',
version : '2.25.6',

parsers : [],
widgets : [],
Expand Down Expand Up @@ -951,15 +951,8 @@
index = 0;
while ( index <= span ) {
// duplicate text (or not) to spanned columns
// instead of setting duplicate span to empty string, use textExtraction to try to get a value
// see http://stackoverflow.com/q/36449711/145346
txt = c.duplicateSpan || index === 0 ?
val :
typeof c.textExtraction !== 'string' ?
ts.getElementText( c, cell, cacheIndex + index ) || '' :
'';
rowData.raw[ cacheIndex + index ] = txt;
cols[ cacheIndex + index ] = txt;
rowData.raw[ cacheIndex + index ] = c.duplicateSpan || index === 0 ? val : '';
cols[ cacheIndex + index ] = c.duplicateSpan || index === 0 ? val : '';
index++;
}
cacheIndex += span;
Expand Down
4 changes: 2 additions & 2 deletions dist/js/vendors/jquery.tablesorter.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit e5f1ca4

Please sign in to comment.