← All changes | include/js/validatewatermark.js +26 -8 1.20 → 1.28 View file →

		@@ -1,14 +1,32 @@
	1	+(function(){
1	2	var vdoWatermarkJson = document.getElementById('vdo_watermarkjson');
2	3	var vdoValidator = document.getElementById('vdojsonvalidator');
3	4
4		-vdoWatermarkJson.onkeyup = function(){
5		- try{
6		- JSON.parse(vdoWatermarkJson.value.replace(/[\'\‘\’\′]/g, '"'));
7		- vdoValidator.innerHTML="Correct JSON";
8		- vdoValidator.style.color = "green";
	5	+function checkValidity(){
	6	+ var obj1 = vdoWatermarkJson.value;
	7	+ if (!obj1){
	8	+ vdoValidator.innerHTML= "Watermark not specified";
	9	+ vdoValidator.style.color = "gray";
9	10	}
10		- catch(error){
11		- vdoValidator.innerHTML="Incorrect JSON";
12		- vdoValidator.style.color = "red";
	11	+ else {
	12	+ try{
	13	+ var obj = JSON.parse(vdoWatermarkJson.value.replace(/['‘’′]/g, '"'));
	14	+ if (obj.constructor.name === 'Array') {
	15	+ vdoValidator.innerHTML="Correct JSON";
	16	+ vdoValidator.style.color = "green";
	17	+ }
	18	+ else {
	19	+ vdoValidator.innerHTML="Not an array";
	20	+ vdoValidator.style.color = "red";
	21	+ }
	22	+ }
	23	+ catch(error){
	24	+ vdoValidator.innerHTML="Incorrect JSON";
	25	+ vdoValidator.style.color = "red";
	26	+ }
13	27	}
14	28	}
	29	+vdoWatermarkJson.onkeyup = checkValidity;
	30	+window.onload = checkValidity;
	31	+
	32	+}());