From c3fa7ef33341899bee6d4a67ffd9835a3bf50dc7 Mon Sep 17 00:00:00 2001 From: Michele Bonazza Date: Tue, 27 Feb 2018 15:24:55 +0100 Subject: [PATCH] Set window.json when formatting from scratch page --- extension/src/json-viewer/check-if-json.js | 5 ++++- extension/src/json-viewer/scratch-pad/load-editor.js | 5 +++++ extension/src/omnibox-page.js | 4 ++-- extension/src/viewer.js | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/extension/src/json-viewer/check-if-json.js b/extension/src/json-viewer/check-if-json.js index affde4d3..3b554e67 100644 --- a/extension/src/json-viewer/check-if-json.js +++ b/extension/src/json-viewer/check-if-json.js @@ -72,4 +72,7 @@ function checkIfJson(sucessCallback, element) { } } -module.exports = checkIfJson; +module.exports = { + checkIfJson: checkIfJson, + isJSON: isJSON +}; diff --git a/extension/src/json-viewer/scratch-pad/load-editor.js b/extension/src/json-viewer/scratch-pad/load-editor.js index fdfdafd0..15dc55f2 100644 --- a/extension/src/json-viewer/scratch-pad/load-editor.js +++ b/extension/src/json-viewer/scratch-pad/load-editor.js @@ -5,6 +5,8 @@ var loadRequiredCss = require('../viewer/load-required-css'); var renderExtras = require('../viewer/render-extras'); var renderFormatButton = require('./render-format-button'); var jsonFormater = require('../jsl-format'); +var JSONUtils = require('../check-if-json'); +var exposeJson = require('../viewer/expose-json'); function loadEditor(pre) { getOptions().then(function(options) { @@ -19,6 +21,9 @@ function loadEditor(pre) { renderFormatButton(function() { var text = highlighter.editor.getValue(); highlighter.editor.setValue(jsonFormater(text)); + if (JSONUtils.isJSON(text)) { + exposeJson(text, true); + } }); }); diff --git a/extension/src/omnibox-page.js b/extension/src/omnibox-page.js index 340cf7bb..ccd704e2 100644 --- a/extension/src/omnibox-page.js +++ b/extension/src/omnibox-page.js @@ -1,4 +1,4 @@ -var checkIfJson = require('./json-viewer/check-if-json'); +var JSONUtils = require('./json-viewer/check-if-json'); var highlightContent = require('./json-viewer/highlight-content'); var loadScratchPadEditor = require('./json-viewer/scratch-pad/load-editor'); @@ -19,7 +19,7 @@ function handleJSONHighlight(pre, query) { var rawJson = query.replace(/^json=/, ''); pre.innerText = decodeURIComponent(rawJson); - checkIfJson(function(pre) { + JSONUtils.checkIfJson(function(pre) { pre.hidden = true; highlightContent(pre, true); }, pre); diff --git a/extension/src/viewer.js b/extension/src/viewer.js index 1c0ba300..df846c7a 100644 --- a/extension/src/viewer.js +++ b/extension/src/viewer.js @@ -1,9 +1,9 @@ require('./viewer-styles'); -var checkIfJson = require('./json-viewer/check-if-json'); +var JSONUtils = require('./json-viewer/check-if-json'); var highlightContent = require('./json-viewer/highlight-content'); function onLoad() { - checkIfJson(function(pre) { + JSONUtils.checkIfJson(function(pre) { pre.hidden = true; highlightContent(pre); });