Skip to content

Commit

Permalink
Released version 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josdejong committed Mar 15, 2015
1 parent fcfac08 commit 45b1941
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 98 deletions.
3 changes: 0 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
app
bower.json
build
downloads
src
misc
node_modules
test
Expand Down
4 changes: 3 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
https://github.com/josdejong/jsoneditor


## not yet released, version 4.1.0
## 2015-03-15, version 4.1.0

- Implemented a function `focus()` for modes tree, view, and form.
- Added `./src` folder to the distributed package, needed for usage via
node.js/browserify.


## 2015-02-28, version 4.0.0
Expand Down
9 changes: 3 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
"version": "4.0.0",
"version": "4.1.0",
"description": "A web-based tool to view, edit and format JSON",
"tags": [
"json",
Expand All @@ -19,10 +19,6 @@
],
"bugs": "https://github.com/josdejong/jsoneditor/issues",
"ignore": [
"app",
"build",
"downloads",
"src",
"misc",
"node_modules",
"test",
Expand All @@ -32,7 +28,8 @@
"index.js",
"package.json",
".npmignore",
".gitignore"
".gitignore",
"npm-debug.log"
],
"dependencies": {}
}
111 changes: 42 additions & 69 deletions dist/jsoneditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
* Copyright (c) 2011-2015 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <[email protected]>
* @version 4.0.0
* @date 2015-03-02
* @version 4.1.0
* @date 2015-03-15
*/
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
Expand All @@ -39,41 +39,41 @@
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/

/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/

/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
/******/ return installedModules[moduleId].exports;
/******/

/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ exports: {},
/******/ id: moduleId,
/******/ loaded: false
/******/ };
/******/

/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/

/******/ // Flag the module as loaded
/******/ module.loaded = true;
/******/

/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/


/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/

/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/

/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/

/******/ // Load entry module and return exports
/******/ return __webpack_require__(0);
/******/ })
Expand Down Expand Up @@ -26506,7 +26506,7 @@ return /******/ (function(modules) { // webpackBootstrap
return str.substr(start, len);
}
;

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(20)))

/***/ },
Expand All @@ -26516,69 +26516,40 @@ return /******/ (function(modules) { // webpackBootstrap
// shim for using process in browser

var process = module.exports = {};
var queue = [];
var draining = false;

process.nextTick = (function () {
var canSetImmediate = typeof window !== 'undefined'
&& window.setImmediate;
var canMutationObserver = typeof window !== 'undefined'
&& window.MutationObserver;
var canPost = typeof window !== 'undefined'
&& window.postMessage && window.addEventListener
;

if (canSetImmediate) {
return function (f) { return window.setImmediate(f) };
function drainQueue() {
if (draining) {
return;
}

var queue = [];

if (canMutationObserver) {
var hiddenDiv = document.createElement("div");
var observer = new MutationObserver(function () {
var queueList = queue.slice();
queue.length = 0;
queueList.forEach(function (fn) {
fn();
});
});

observer.observe(hiddenDiv, { attributes: true });

return function nextTick(fn) {
if (!queue.length) {
hiddenDiv.setAttribute('yes', 'no');
}
queue.push(fn);
};
draining = true;
var currentQueue;
var len = queue.length;
while(len) {
currentQueue = queue;
queue = [];
var i = -1;
while (++i < len) {
currentQueue[i]();
}
len = queue.length;
}

if (canPost) {
window.addEventListener('message', function (ev) {
var source = ev.source;
if ((source === window || source === null) && ev.data === 'process-tick') {
ev.stopPropagation();
if (queue.length > 0) {
var fn = queue.shift();
fn();
}
}
}, true);

return function nextTick(fn) {
queue.push(fn);
window.postMessage('process-tick', '*');
};
draining = false;
}
process.nextTick = function (fun) {
queue.push(fun);
if (!draining) {
setTimeout(drainQueue, 0);
}

return function nextTick(fn) {
setTimeout(fn, 0);
};
})();
};

process.title = 'browser';
process.browser = true;
process.env = {};
process.argv = [];
process.version = ''; // empty string to avoid regexp issues
process.versions = {};

function noop() {}

Expand All @@ -26599,6 +26570,7 @@ return /******/ (function(modules) { // webpackBootstrap
process.chdir = function (dir) {
throw new Error('process.chdir is not supported');
};
process.umask = function() { return 0; };


/***/ },
Expand Down Expand Up @@ -26633,9 +26605,10 @@ return /******/ (function(modules) { // webpackBootstrap
return type ? builder.getBlob(type) : builder.getBlob()
}
}

/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))

/***/ }
/******/ ])
});
;
2 changes: 1 addition & 1 deletion dist/jsoneditor.map

Large diffs are not rendered by default.

42 changes: 25 additions & 17 deletions dist/jsoneditor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
"version": "4.0.0",
"version": "4.1.0",
"main": "./index",
"description": "A web-based tool to view, edit and format JSON",
"tags": [
Expand Down
Empty file modified src/css/img/export.sh
100755 → 100644
Empty file.

0 comments on commit 45b1941

Please sign in to comment.