deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-13 20:06:59 +02:00
Code Issues Releases Wiki Activity

Exploring build options requirejs (2)

Browse source
This commit is contained in:
Max Guglielmi 2015-03-08 22:30:08 +11:00
parent 2fd0bfd7ff
commit d4a489141b
5 changed files with 57 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Gruntfile.js
View file

@ -37,10 +37,12 @@ module.exports = function (grunt) {
requirejs: {
compile: {
options: {
// appDir: "<%= dist_folder %>",
baseUrl: '<%= source_folder %>',
paths: {
'sortabletable': 'extensions/sortabletable',
'adapterSortabletable': 'extensions/sortabletable/adapterSortabletable'
almond: '../libs/almond/almond',
sortabletable: 'extensions/sortabletable/sortabletable',
adapterSortabletable: 'extensions/sortabletable/adapterSortabletable'
},
// include: ['../libs/almond/almond', 'tablefilter'],
// exclude: [
@ -54,8 +56,9 @@ module.exports = function (grunt) {
startFile: "<%= source_folder %>start.frag",
endFile: "<%= source_folder %>end.frag"
},
// insertRequire: ['tablefilter'],
shim: {
'SortableTable': {
'sortabletable': {
exports: 'SortableTable'
}
},
@ -63,6 +66,7 @@ module.exports = function (grunt) {
{
name: 'extensions/sortabletable/adapterSortabletable',
include: [
'extensions/sortabletable/sortabletable',
'extensions/sortabletable/adapterSortabletable'
]
},
@ -70,17 +74,13 @@ module.exports = function (grunt) {
name: 'tablefilter',
create: true,
include: [
'../libs/almond/almond',
'almond',
'tablefilter'
],
exclude: ['require'],
excludeShallow: [
'extensions/sortabletable/adapterSortabletable'
'adapterSortabletable'
]
// ,
// exclude: [
// 'extensions/sortabletable/sortabletable',
// 'extensions/sortabletable/adapterSortabletable'
// ]
}
],
removeCombined: true,

2
dist/filtergrid.css vendored
View file

@ -1,6 +1,6 @@
/*------------------------------------------------------------------------
- TableFilter stylesheet by Max Guglielmi
- (build date: Sat Mar 07 2015 22:12:50)
- (build date: Sun Mar 08 2015 22:28:39)
- Edit below for your projects' needs
------------------------------------------------------------------------*/

4
dist/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

51
src-es6/tablefilter.js
View file

@ -1653,13 +1653,29 @@ export default class TableFilter{
// 'extensions/sortabletable/adapterSortabletable',
// function(){}
// );
var AdapterSortableTable = require(
['extensions/sortabletable/adapterSortabletable'],
function(adapterSortabletable){
console.log(adapterSortabletable);
o.Extensions.sort = new adapterSortabletable(o);
o.Extensions.sort.init();
});
// require.config({
// baseUrl: '../dist',
// paths: {
// 'a': '/tablefilter',
// 'SortableTable':
// '/extensions/sortabletable/sortabletable',
// 'sortabletable':
// '/extensions/sortabletable/adapterSortabletable'
// },
// name: '../dist/extensions/sortabletable/adapterSortabletable'
// });
// Lazy loading for the sort extension
// console.log('lazy', define);
// define(['require'], function(require){
// console.log(require);
var AdapterSortableTable = require(
['extensions/sortabletable/adapterSortabletable'],
function(adapterSortabletable){
o.Extensions.sort = new adapterSortabletable(o);
o.Extensions.sort.init();
});
// });
};
}
@ -1673,11 +1689,30 @@ export default class TableFilter{
}
// Import require.js if required for production environment
console.log('is require loaded: ' + o.isImported('require.js'));
if(o.isImported('require.js')){
loadSortableTable();
} else {
o.includeFile(
'tf-requirejs', o.basePath + 'require.js', loadSortableTable);
'tf-requirejs', o.basePath + 'require.js', o.Evt._EnableSort);
// o.includeFile('tf-requirejs',
// o.basePath + 'require.js',
// function(){
// Lazy loading for the sort extension
// console.log('lazy', define);
// define(['require'], function(require){
// console.log(require);
// var AdapterSortableTable = require(
// ['extensions/sortabletable/adapterSortabletable'],
// function(adapterSortabletable){
// console.log(adapterSortabletable);
// // o.Extensions.sort = new adapterSortabletable(o);
// // o.Extensions.sort.init();
// });
// });
// }
// );
}
}

2
src/tablefilter.js
View file

File diff suppressed because one or more lines are too long