From d25e2ca3f7583558abfeee2690f56faebdf39ec3 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Sun, 16 Aug 2009 04:14:46 +0000 Subject: [PATCH] "MDL-13766, move common functions to javascript-static.js" --- lib/javascript-static.js | 25 +++++++++++++++++++++++++ repository/repository.src.js | 7 +------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 98e86ebad4..c4111a9e19 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -1125,6 +1125,31 @@ function build_querystring(obj) { } return list.join('&'); } + +function stripHTML(str) { + var re = /<\S[^><]*>/g; + var ret = str.replace(re, ""); + return ret; +} + +function json_decode(json) { + try { + var obj = YAHOO.lang.JSON.parse(json); + } catch (e) { + alert(e.toString()); + } + return obj; +} + +function json_encode(data) { + try { + var json = YAHOO.lang.JSON.stringify(data); + } catch (e) { + alert(e.toString()); + } + return json; +} + /** * Finds all help icons on the page and initiates YUI tooltips for * each of them, which load a truncated version of the help's content diff --git a/repository/repository.src.js b/repository/repository.src.js index 95b2566626..1facb7db1e 100644 --- a/repository/repository.src.js +++ b/repository/repository.src.js @@ -971,11 +971,6 @@ repository_client.postdata = function(obj) { return str; } -repository_client.stripHTML = function(str){ - var re= /<\S[^><]*>/g - var ret = str.replace(re, "") - return ret; -} repository_client.popup = function(client_id, url) { window.open(url,'repo_auth', 'location=0,status=0,scrollbars=0,width=500,height=300'); cached_client_id = client_id; @@ -1121,7 +1116,7 @@ repository_client.parse_json = function(txt, source) { try { var ret = YAHOO.lang.JSON.parse(txt); } catch(e) { - alert(fp_lang.invalidjson+' - |'+source+'| -'+this.stripHTML(txt)); + alert(fp_lang.invalidjson+' - |'+source+'| -'+stripHTML(txt)); } return ret; } -- 2.39.5