From a8e0c049f2900cbff344464a661660942e9c6b62 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 11 Oct 2012 18:28:12 +0200 Subject: [PATCH] Splits up type js into js and json. --- src/_h5ai/client/icons/16x16/json.png | Bin 0 -> 540 bytes src/_h5ai/client/icons/48x48/json.png | Bin 0 -> 3023 bytes .../client/js/inc/parser/generic-json.js | 32 ++++-------------- src/_h5ai/conf/options.json | 5 +-- src/_h5ai/conf/types.json | 3 +- 5 files changed, 12 insertions(+), 28 deletions(-) create mode 100644 src/_h5ai/client/icons/16x16/json.png create mode 100644 src/_h5ai/client/icons/48x48/json.png diff --git a/src/_h5ai/client/icons/16x16/json.png b/src/_h5ai/client/icons/16x16/json.png new file mode 100644 index 0000000000000000000000000000000000000000..af1a475ead21e02a00da6079b97013b454f69dd4 GIT binary patch literal 540 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 literal 0 HcmV?d00001 diff --git a/src/_h5ai/client/js/inc/parser/generic-json.js b/src/_h5ai/client/js/inc/parser/generic-json.js index adc0f742..6443593a 100644 --- a/src/_h5ai/client/js/inc/parser/generic-json.js +++ b/src/_h5ai/client/js/inc/parser/generic-json.js @@ -1,29 +1,7 @@ -modulejs.define('parser/generic-json', ['_', '$', 'core/settings', 'model/entry'], function (_, $, settings, Entry) { +modulejs.define('parser/generic-json', ['_', '$', 'model/entry'], function (_, $, Entry) { - var parseJson = function (absHref, json) { - - if (!settings.custom) { - settings.custom = {}; - } - if (_.has(json, 'customHeader')) { - settings.custom.header = json.customHeader; - } - if (_.has(json, 'customFooter')) { - settings.custom.footer = json.customFooter; - } - return _.map(json.entries, function (jsonEntry) { - - return Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status, jsonEntry.content); - }); - }, - - parseJsonStr = function (absHref, jsonStr) { - - return parseJson(absHref, JSON.parse($.trim(jsonStr) || '{}')); - }, - - parse = function (absHref, html) { + var parse = function (absHref, html) { var id = '#data-generic-json', $html = $(html), @@ -33,7 +11,11 @@ modulejs.define('parser/generic-json', ['_', '$', 'core/settings', 'model/entry' $id = $html.find(id); } - return parseJsonStr(absHref, $id.text()); + var json = JSON.parse($.trim($id.text()) || '{}'); + return _.map(json.entries, function (jsonEntry) { + + return Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status, jsonEntry.content); + }); }; return { diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 511341ef..87bd962b 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -223,16 +223,17 @@ Options "install": "plain", "log": "plain", "java": "java", + "js": "js", + "json": "js", "makefile": "xml", "markdown": "plain", - /*"php": "php",*/ + // "php": "php", "python": "python", "readme": "plain", "rb": "ruby", "rtf": "plain", "script": "shell", "text": "plain", - "js": "js", "xml": "xml" } }, diff --git a/src/_h5ai/conf/types.json b/src/_h5ai/conf/types.json index 71ffa28e..14f23ca5 100644 --- a/src/_h5ai/conf/types.json +++ b/src/_h5ai/conf/types.json @@ -40,7 +40,8 @@ File types mapped to file extensions "install": ["install"], "java": [".java"], "jpg": [".jpg", ".jpeg"], - "js": [".js", ".json"], + "js": [".js"], + "json": [".json"], "log": [".log", "changelog"], "makefile": [".pom", "build.xml", "pom.xml"], "markdown": [".markdown", ".md"],