Skip to content

Set window.json when formatting from scratch page #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2018
Merged

Set window.json when formatting from scratch page #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion extension/src/json-viewer/check-if-json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,7 @@ function checkIfJson(sucessCallback, element) {
}
}

module.exports = checkIfJson;
module.exports = {
checkIfJson: checkIfJson,
isJSON: isJSON
};
5 changes: 5 additions & 0 deletions extension/src/json-viewer/scratch-pad/load-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
});

});
Expand Down
4 changes: 2 additions & 2 deletions extension/src/omnibox-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');

Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions extension/src/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
});
Expand Down