Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tly1980 committed Oct 29, 2012
2 parents 29c09c9 + 8e60444 commit c0efc61
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion grunt.js
@@ -1,5 +1,5 @@
module.exports = function(grunt) {

"use strict";
// Project configuration.
grunt.initConfig({
test: {
Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "grunt-html2json",
"description": "The best sample grunt tasks ever.",
"description": "Compiling the html templates into on single JSON file.",
"version": "0.1.0",
"homepage": "https://github.com/minddriven/grunt-html2json",
"author": {
Expand Down Expand Up @@ -34,4 +34,4 @@
"keywords": [
"gruntplugin"
]
}
}
10 changes: 5 additions & 5 deletions tasks/html2json.js
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = function(grunt) {

"use strict";
// ==========================================================================
// TASKS
// ==========================================================================
Expand All @@ -34,10 +34,10 @@ module.exports = function(grunt) {
// HELPERS
// ==========================================================================

function filename_to_key(filenmame){
ret = filenmame.split('/').pop();
ret = ret.split('.').shift();
return ret;
function filename_to_key(filename){
var filename_new = filename.split('/').pop();
filename_new = filename_new.split('.').shift();
return filename_new;
}

// Concat source files and/or directives.
Expand Down
23 changes: 13 additions & 10 deletions test/html2json_test.js
Expand Up @@ -21,14 +21,17 @@ var grunt = require('grunt');
*/

exports['html2json'] = {
setUp: function(done) {
// setup here
done();
},
'helper': function(test) {
test.expect(1);
// tests here
test.equal(grunt.helper('html2json'), 'html2json!!!', 'should return the correct value.');
test.done();
}

// setUp: function(done) {
// // setup here
// "use strict";
// done();
// },
// 'helper': function(test) {
// "use strict";
// test.expect(1);
// // tests here
// //test.equal(grunt.helper('html2json'), 'html2json!!!', 'should return the correct value.');
// test.done();
// }
};
4 changes: 2 additions & 2 deletions test_prj/grunt.js
@@ -1,5 +1,5 @@
module.exports = function(grunt) {

"use strict";
// // Project configuration.
grunt.initConfig({
html2json: {
Expand All @@ -16,7 +16,7 @@ module.exports = function(grunt) {
});

// Load local tasks.
grunt.loadTasks('../tasks');
grunt.loadTasks('html2json');

// Default task.
grunt.registerTask('default', 'html2json');
Expand Down

0 comments on commit c0efc61

Please sign in to comment.