Yoji SHIDARA
null+****@clear*****
Tue Sep 25 13:34:32 JST 2012
Yoji SHIDARA 2012-09-25 13:34:32 +0900 (Tue, 25 Sep 2012) New Revision: 83b1e180385280f0eb0244e6a13516d87d5c4000 https://github.com/groonga/gcs/commit/83b1e180385280f0eb0244e6a13516d87d5c4000 Log: Remove all client-side template related codes Removed files: client_templates/results.jade Modified files: lib/dashboard.js lib/server.js test/dashboard.test.js views/index.jade Deleted: client_templates/results.jade (+0 -19) 100644 =================================================================== --- client_templates/results.jade 2012-09-25 13:29:05 +0900 (067e04e) +++ /dev/null @@ -1,19 +0,0 @@ -.pager#pager - li.previous - a(href="#") ← Previous - li.next - a(href="#") Next → -table.table.table-bordered - if hits.hit.length > 0 - each record, index in hits.hit - tr.id-row - td= hits.start + index + 1 - td.id-cell(colspan="2")= record.id - each value, columnName in record.data - tr - td - td= columnName - td= value - else - tr - td No record matched for the query. Modified: lib/dashboard.js (+0 -28) =================================================================== --- lib/dashboard.js 2012-09-25 13:29:05 +0900 (9123163) +++ lib/dashboard.js 2012-09-25 13:34:32 +0900 (1eaa037) @@ -6,31 +6,3 @@ function rootHandler(request, response) { return response.render('index.jade', {layout: false}); } exports.rootHandler = rootHandler; - -function renderFile(filename, templateDirectory) { - var templatePath = path.join(templateDirectory, filename); - var template = fs.readFileSync(templatePath); - var name = path.basename(filename, '.jade'); - - var head = '(function() {' + - 'this.JST || (this.JST = {});' + - 'this.JST[' + JSON.stringify(name) + '] = '; - var tail = '; }).call(this);'; - var fn = jade.compile(template, {filename: filename, client: true, compileDebug: false}); - - return head + fn.toString() + tail; -} - -function templatesHandler(request, response) { - var templateDirectory = path.join(__dirname, '/../client_templates'); - var templates = fs.readdirSync(templateDirectory).filter(function(path) { - return path.match(/\.jade$/); - }); - - var rendered = templates.map(function(path) { - return renderFile(path, templateDirectory); - }); - - return response.send(rendered.join(''), {'Content-Type': 'application/javascript'}); -} -exports.templatesHandler = templatesHandler; Modified: lib/server.js (+0 -1) =================================================================== --- lib/server.js 2012-09-25 13:29:05 +0900 (9032663) +++ lib/server.js 2012-09-25 13:34:32 +0900 (5cf0218) @@ -32,7 +32,6 @@ exports.createServer = function (config) { }); application.get('/', dashboard.rootHandler); - application.get('/js/templates.js', dashboard.templatesHandler); return application; }; Modified: test/dashboard.test.js (+0 -13) =================================================================== --- test/dashboard.test.js 2012-09-25 13:29:05 +0900 (9e3b9d6) +++ test/dashboard.test.js 2012-09-25 13:34:32 +0900 (7fa8acb) @@ -25,17 +25,4 @@ suite('dashboard', function() { done(error); }); }); - - test('GET /js/templates.js', function(done) { - utils - .get('/js/templates.js') - .next(function(response) { - assert.equal(response.statusCode, 200); - assert.include(response.body, "this.JST"); - done(); - }) - .error(function(error) { - done(error); - }); - }); }); Modified: views/index.jade (+0 -3) =================================================================== --- views/index.jade 2012-09-25 13:29:05 +0900 (0157eda) +++ views/index.jade 2012-09-25 13:34:32 +0900 (3601586) @@ -7,7 +7,6 @@ html script(src="/js/handlebars-1.0.rc.1.js", type="text/javascript") script(src="/js/ember-latest.js", type="text/javascript") script(src="/js/gcs.js", type="text/javascript") - script(src="/js/templates.js", type="text/javascript") link(href="/css/bootstrap.min.css", rel="stylesheet") link(href="/css/gcs.css", rel="stylesheet") @@ -66,6 +65,4 @@ html {{/each}} {{/each}} {{/if}} - - #results body -------------- next part -------------- HTML����������������������������...Descargar
