Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-19 09:24:51 +00:00
Code Issues Projects Releases Wiki Activity

feature(util) parseJSON -> json.parse, stringifyJSON -> json.stringify

Browse source
This commit is contained in:
coderaiser 2014-09-26 08:18:44 -04:00
parent 1e88a5ecc1
commit 37abf1e262
11 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/client.js
View file

@ -333,7 +333,7 @@ var Util, DOM, CloudFunc, join;
function ajaxLoad(path, options, panel, callback) {
var create = function(error, json) {
var RESTful = DOM.RESTful,
obj = Util.parseJSON(json),
obj = Util.json.parse(json),
isRefresh = options.refresh,
history = options.history;
@ -473,7 +473,7 @@ var Util, DOM, CloudFunc, join;
});
}
ret = Util.stringifyJSON(fileTable);
ret = Util.json.stringify(fileTable);
return ret;
}

4
lib/client/buffer.js
View file

@ -113,7 +113,7 @@ var Util, DOM;
if (error) {
DOM.Dialog.alert(error);
} else if (cp) {
data = Util.parseJSON(cp);
data = Util.json.parse(cp);
data.to = path;
if (data.from === path)
@ -122,7 +122,7 @@ var Util, DOM;
DOM.copyFiles(data);
} else if (ct) {
data = Util.parseJSON(ct);
data = Util.json.parse(ct);
data.to = path;
if (data.from === path)

2
lib/client/dom.js
View file

@ -830,7 +830,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
ONE_MEGABYTE = 1024 * 1024 * 1024;
if (Util.isObject(data))
data = Util.stringifyJSON(data);
data = Util.json.stringify(data);
length = data.length;
if (hash && length < ONE_MEGABYTE)

2
lib/client/edit.js
View file

@ -350,7 +350,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
DOM.load.ajax({
url : JSHINT_PATH,
success : function(data) {
JSHintConfig = Util.parseJSON(data);
JSHintConfig = Util.json.parse(data);
func();
}
});

4
lib/client/load.js
View file

@ -174,7 +174,7 @@ var Util, DOM;
xhr.responseType = p.responseType;
if (isObject || isArray)
data = Util.stringifyJSON(p.data);
data = Util.json.stringify(p.data);
else
data = p.data;
@ -209,7 +209,7 @@ var Util, DOM;
if (p.dataType !== 'text')
/* If it's json - parse it as json */
if (type && isContain)
data = Util.parseJSON(xhr.response) || xhr.response;
data = Util.json.parse(xhr.response) || xhr.response;
Util.exec(p.success, data, xhr.statusText, xhr);
}

6
lib/client/polyfill.js
View file

@ -210,10 +210,10 @@ var Util, DOM, jQuery;
}
if (!window.JSON) {
Util.parseJSON = $.parseJSON;
Util.json.parse = $.parseJSON;
/* https://gist.github.com/754454 */
Util.stringifyJSON = function(obj) {
Util.json.stringify = function(obj) {
var n, v, has,
ret = '',
value = '',
@ -241,7 +241,7 @@ var Util, DOM, jQuery;
if (isStr)
v = '"' + v + '"';
else if (v && isObj)
v = Util.stringifyJSON(v);
v = Util.json.stringify(v);
if (!isArray)
value = '"' + n + '":';

2
lib/client/storage.js
View file

@ -64,7 +64,7 @@ var Util, DOM;
var str, ret = Allowed && name;
if (Util.isObject(data))
str = Util.stringifyJSON(data);
str = Util.json.stringify(data);
if (Allowed && name)
localStorage.setItem(name, str || data);

2
lib/server/config.js
View file

@ -26,7 +26,7 @@
};
module.exports.save = function(callback) {
var data = Util.stringifyJSON(config);
var data = Util.json.stringify(config);
Util.checkArgs(arguments, ['callback']);

4
lib/server/ischanged.js
View file

@ -84,14 +84,14 @@
if (!error && readTime !== fileTime) {
timeChanged = true;
Times[name] = fileTime;
json = Util.stringifyJSON(Times);
json = Util.json.stringify(Times);
fs.writeFile(NAME, json, function(error) {
if (error)
Util.log(error);
});
}
callback(error, timeChanged);
});
});

14
lib/server/rest.js
View file

@ -181,7 +181,7 @@
if (isStr)
str = data;
else
str = Util.stringifyJSON(data);
str = Util.json.stringify(data);
}
callback(error, options, str);
@ -196,7 +196,7 @@
if (error) {
callback(error);
} else {
files = Util.parseJSON(body);
files = Util.json.parse(body);
Fs.delete(query, path, files, function(error) {
var names, msg;
@ -232,7 +232,7 @@
switch(cmd) {
case '':
p.data = Util.stringifyJSON({
p.data = Util.json.stringify({
info: 'Cloud Commander API v1'
});
@ -271,12 +271,12 @@
if (name[0] === '/')
cmd = name.replace('/', '');
files = Util.parseJSON(body);
files = Util.json.parse(body);
switch(cmd) {
case 'auth':
github.auth(body, function(error, token) {
callback(error, Util.stringifyJSON({
callback(error, Util.json.stringify({
data: token
}));
});
@ -391,7 +391,7 @@
config(name, files[name]);
});
json = Util.stringifyJSON(config) + '\n';
json = Util.json.stringify(config) + '\n';
config.save(function(error) {
data = formatMsg('config', name);
@ -461,7 +461,7 @@
isObj = Util.isObject(dataParam);
if (isObj)
data = Util.stringifyJSON(dataParam);
data = Util.json.stringify(dataParam);
else
data = dataParam;

51
lib/util.js
View file

@ -168,32 +168,35 @@
return ret;
};
/**
* @param pJSON
*/
this.parseJSON = function(str) {
var obj;
Util.exec.try(function() {
obj = JSON.parse(str);
});
return obj;
};
this.json = new JsonProto();
/**
* @param pObj
*/
this.stringifyJSON = function(obj) {
var str;
function JsonProto() {
/**
* @param str
*/
this.parse = function(str) {
var obj;
Util.exec.try(function() {
obj = JSON.parse(str);
});
return obj;
},
Util.exec.tryLog(function() {
str = JSON.stringify(obj, null, 4);
});
return str;
};
/**
* @param obj
*/
this.stringify = function(obj) {
var str;
Util.exec.tryLog(function() {
str = JSON.stringify(obj, null, 4);
});
return str;
};
}
/**
* function check is strings are equal
* @param {String} str1