archive-gh-me/systemjs
1
0
Fork 0
mirror of https://github.com/systemjs/systemjs.git synced 2026-01-25 14:57:38 +00:00
Code Issues Projects Releases Wiki Activity

plugin fix

Browse Source
This commit is contained in:
guybedford 2013-11-04 22:55:22 +02:00
parent 8da9c24764
commit b5935bdef1
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader.js
View File

@ -312,7 +312,7 @@
return singleGlobal ? { default: singleGlobal } : moduleGlobal;
}
var pluginRegEx = /(\.[^\/\.]+)?!(.*)/;
var pluginRegEx = /(\.[^\/\.]+|.)!(.*)/;
var nodeProcess = {
nextTick: function(f) {

27
test/test.html
View File

@ -4,11 +4,6 @@
<script src="../loader.js" type="text/javascript"></script>
<script>
jspm.config({
locations: {
plugin: '../../jspm-plugins'
}
});
jspm.import('./test-runner', function(runner) {
runner.execute([
@ -234,7 +229,7 @@
run: function(complete) {
jspm.config({
map: {
'plugin:coffee': './tests/compiler-plugin'
'!coffee': './tests/compiler-plugin'
}
});
jspm.import(['./tests/compiler-test.coffee!'], complete);
@ -246,16 +241,6 @@
return 'Compiler not working.';
}
},
{
name: 'Handlebars plugin',
run: function(complete) {
jspm.import('./tests/hbs.hbs!', complete);
},
confirm: function(m) {
if (m({ title: 'hello' }) != '<h1>hello</h1>\n')
return 'Handlebars template not compiled';
}
},
{
name: 'Text plugin',
run: function(complete) {
@ -300,6 +285,16 @@
confirm: function(m) {
}
},
{
name: 'Handlebars plugin',
run: function(complete) {
jspm.import('./tests/hbs.hbs!', complete);
},
confirm: function(m) {
if (m({ title: 'hello' }) != '<h1>hello</h1>\n')
return 'Handlebars template not compiled';
}
},
{
name: 'onLoad hook',
run: function(complete) {