テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 11 年前差分は期限切れになりません

2 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

165 行

66 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

225 行

var gpoFox = {

basePath : "",

//basePathLocked : "",

defaultPath : "",

lockedPath : "",

reg : "",

prefService : "",

updateDisabled : false,

//Disable Update button in Help menu

disableUpdates : function(){

if(gpoFox.updateDisabled){

var name = document.getElementById("checkForUpdates");

name.disabled = true;

}

//Read value from registry

readRegistryValue : function(value){

switch (gpoFox.reg.getValueType(value)) {

case gpoFox.reg.TYPE_STRING:

return gpoFox.reg.readStringValue(value);

case gpoFox.reg.TYPE_BINARY:

return gpoFox.reg.readBinaryValue(value);

case gpoFox.reg.TYPE_INT:

return gpoFox.reg.readIntValue(value);

case gpoFox.reg.TYPE_INT64:

return gpoFox.reg.readInt64Value(value);

}

// unknown type

return null;

//write value to FF preferences

writePrefValue : function(name,value,locked){

if(locked){

return gpoFox.writeLockedPrefValue(name,value);

}else{

return gpoFox.writeUserPrefValue(name,value);

}

return null;

//for writing a locked pref

writeLockedPrefValue : function(name,value){

var prefBranch = gpoFox.prefService.getDefaultBranch(name);

switch (prefBranch.getPrefType("")) {

case prefBranch.PREF_STRING:

prefBranch.setCharPref("", value);

prefBranch.lockPref("");

return true;

case prefBranch.PREF_INT:

prefBranch.setIntPref("", value);

prefBranch.lockPref("");

return true;

case prefBranch.PREF_BOOL:

if(name=="app.update.enabled" && value==false){

gpoFox.updateDisabled=true;

}

prefBranch.setBoolPref("", value);

if ( value == "false" ){

prefBranch.setBoolPref("", false);

}else{

prefBranch.setBoolPref("", true);

}

prefBranch.lockPref("");

return true;

default:

switch(gpoFox.getLocalType(value))

{

case "string":

if ( value == "false" ){

prefBranch.setBoolPref("", false);

}else{

prefBranch.setBoolPref("", true);

}

return true;

case "int":

prefBranch.setIntPref("", value);

return true;

case "bool":

prefBranch.setBoolPref("", false);

return true;

default:

return false;

}

return null;

//for writing a user pref

writeUserPrefValue : function(name,value){

var prefBranch = gpoFox.prefService.getBranch(name);

switch (prefBranch.getPrefType("")) {

case prefBranch.PREF_STRING:

prefBranch.setCharPref("", value);

return true;

case prefBranch.PREF_INT:

prefBranch.setIntPref("", value);

return true;

case prefBranch.PREF_BOOL:

prefBranch.setBoolPref("", value);

if ( value == "false" ){

prefBranch.setBoolPref("", false);

}else{

prefBranch.setBoolPref("", true);

}

return true;

default:

switch(gpoFox.getLocalType(value))

{

case "string":

prefBranch.setCharPref("", value);

return true;

case "int":

prefBranch.setIntPref("", value);

return true;

case "bool":

if ( value == "false" ){

prefBranch.setBoolPref("", false);

}else{

prefBranch.setBoolPref("", true);

}

return true;

default:

return false;

}

return null;

//Set a FF preference

//will call setLockPref or setUserPref depending on if locked is set to true or false

setPref : function(type,locked){

if(locked){

gpoFox.setLockPref(type);

}

else{

gpoFox.setUserPref(type);

}

//set a FF locked preference

setLockPref : function(type){

gpoFox.reg.open(type,gpoFox.basePath + "\\" + gpoFox.lockedPath,gpoFox.reg.ACCESS_READ);

for (var i = 0; i < gpoFox.reg.valueCount; i++)

{

var prefName = gpoFox.reg.getValueName(i);

var FirefoxSetter = gpoFox.readRegistryValue(prefName);

gpoFox.writePrefValue(prefName,FirefoxSetter,true);

}

gpoFox.reg.close();

//set a FF user preference

setUserPref : function(type){

gpoFox.reg.open(type,gpoFox.basePath + "\\" + gpoFox.defaultPath,gpoFox.reg.ACCESS_READ);

for (var i = 0; i < gpoFox.reg.valueCount; i++)

{

var prefName = gpoFox.reg.getValueName(i);

var FirefoxSetter = gpoFox.readRegistryValue(prefName);

gpoFox.writePrefValue(prefName,FirefoxSetter,false);

}

gpoFox.reg.close();

getLocalType : function(value){

var returnValue = "string";

if ( value == "true" || value == "false" ){

return "bool"

}else{

try{

if (value > -1 ){

return "int"

}

}catch(ex){}

}

return returnValue;

//Main function

gpofirefox : function(){

try {

//set locked preferences from computer GPO

gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);

if(gpoFox.reg.hasChild(gpoFox.lockedPath)){

gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,true);

}

//set user preferences from computer GPO

gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);

if(gpoFox.reg.hasChild(gpoFox.defaultPath)){

gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,false);

}

//set locked preferences from user GPO

gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);

if(gpoFox.reg.hasChild(gpoFox.lockedPath)){

gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,true);

}

//set user preferences from user GPO

gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);

if(gpoFox.reg.hasChild(gpoFox.defaultPath)){

gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,false);

}

}catch(ex){}

onLoad : function(){

//Define path where to read registry

this.basePath = "Software\\Policies";

this.defaultPath = "Mozilla\\defaultPref";

this.lockedPath = "Mozilla\\lockPref";

//load XPCOM component to read registry

this.reg = Components.classes["@mozilla.org/windows-registry-key;1"].createInstance(Components.interfaces.nsIWindowsRegKey);

//load XPCOM component to read and write preferences

this.prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);

var helpMenu = document.getElementById("menu_HelpPopup");

if (helpMenu)

helpMenu.addEventListener("popupshowing", gpoFox.disableUpdates, false);

this.gpofirefox();

return;

}

};

window.addEventListener("load",function(e){gpoFox.onLoad(e);},false);

保存された差分

原文

ファイルを開く

var gpoFox = {

basePath : "",
	//basePathLocked : "",
	defaultPath : "",
	lockedPath : "",
	reg : "",
	prefService : "",
	updateDisabled : false,

//Disable Update button in Help menu
	disableUpdates : function(){
		if(gpoFox.updateDisabled){
			var name = document.getElementById("checkForUpdates");
			name.disabled = true;
		}
	},

//Read value from registry
	readRegistryValue : function(value){
	  switch (gpoFox.reg.getValueType(value)) {
		case gpoFox.reg.TYPE_STRING:
		  return gpoFox.reg.readStringValue(value);
		case gpoFox.reg.TYPE_BINARY:
		  return gpoFox.reg.readBinaryValue(value);
		case gpoFox.reg.TYPE_INT:
		  return gpoFox.reg.readIntValue(value);
		case gpoFox.reg.TYPE_INT64:
		  return gpoFox.reg.readInt64Value(value);
	  }
	  // unknown type
	  return null;
	},

//write value to FF preferences
	writePrefValue : function(name,value,locked){
		if(locked){
			return gpoFox.writeLockedPrefValue(name,value);
		}else{
			return gpoFox.writeUserPrefValue(name,value);
		}
		return null;
	},

//set a FF user preference
	setUserPref : function(type){
		gpoFox.reg.open(type,gpoFox.basePath + "\\" + gpoFox.defaultPath,gpoFox.reg.ACCESS_READ);
		for (var i = 0; i < gpoFox.reg.valueCount; i++)
		{
			var prefName = gpoFox.reg.getValueName(i);
			var FirefoxSetter = gpoFox.readRegistryValue(prefName);
			gpoFox.writePrefValue(prefName,FirefoxSetter,false);
		}
		gpoFox.reg.close();
	},

//Main function
	gpofirefox : function(){
		try {
			//set locked preferences from computer GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.lockedPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,true);
			}
			//set user preferences from computer GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.defaultPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,false);
			}
			//set locked preferences from user GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.lockedPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,true);
			}
			//set user preferences from user GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.defaultPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,false);
			}
		}catch(ex){}
	},

onLoad : function(){
		//Define path where to read registry
		this.basePath = "Software\\Policies";
		this.defaultPath = "Mozilla\\defaultPref";
		this.lockedPath = "Mozilla\\lockPref";
		//load XPCOM component to read registry
		this.reg = Components.classes["@mozilla.org/windows-registry-key;1"].createInstance(Components.interfaces.nsIWindowsRegKey);
		//load XPCOM component to read and write preferences
		this.prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
		
		var helpMenu = document.getElementById("menu_HelpPopup");
		if (helpMenu)
			helpMenu.addEventListener("popupshowing", gpoFox.disableUpdates, false);
		this.gpofirefox();
		return;
	}
};

window.addEventListener("load",function(e){gpoFox.onLoad(e);},false);

変更されたテキスト

ファイルを開く

var gpoFox = {

basePath : "",
	//basePathLocked : "",
	defaultPath : "",
	lockedPath : "",
	reg : "",
	prefService : "",
	updateDisabled : false,

//Disable Update button in Help menu
	disableUpdates : function(){
		if(gpoFox.updateDisabled){
			var name = document.getElementById("checkForUpdates");
			name.disabled = true;
		}
	},

//for writing a locked pref
	writeLockedPrefValue : function(name,value){
		var prefBranch = gpoFox.prefService.getDefaultBranch(name);
		switch (prefBranch.getPrefType("")) {
			case prefBranch.PREF_STRING:
				prefBranch.setCharPref("", value);
				prefBranch.lockPref("");
				return true;
			case prefBranch.PREF_INT:
				prefBranch.setIntPref("", value);
				prefBranch.lockPref("");
				return true;
			case prefBranch.PREF_BOOL:
				if(name=="app.update.enabled" && value==false){
					gpoFox.updateDisabled=true;
				}
				if ( value == "false" ){
					prefBranch.setBoolPref("", false);
				}else{
					prefBranch.setBoolPref("", true);
				}
				prefBranch.lockPref("");
				return true;
			default:
				switch(gpoFox.getLocalType(value))
				{
					case "string":
						if ( value == "false" ){
							prefBranch.setBoolPref("", false);
						}else{
							prefBranch.setBoolPref("", true);
						}
						return true;
					case "int":
						prefBranch.setIntPref("", value);
						return true;
					case "bool":
						prefBranch.setBoolPref("", false);
						return true;
					default:
						return false;
				}
		}
		return null;
	},

//for writing a user pref
	writeUserPrefValue : function(name,value){
		var prefBranch = gpoFox.prefService.getBranch(name);
			switch (prefBranch.getPrefType("")) {
				case prefBranch.PREF_STRING:
					prefBranch.setCharPref("", value);
					return true;
				case prefBranch.PREF_INT:
					prefBranch.setIntPref("", value);
					return true;
				case prefBranch.PREF_BOOL:
					if ( value == "false" ){
						prefBranch.setBoolPref("", false);
					}else{
						prefBranch.setBoolPref("", true);
					}
					return true;
				default:
					switch(gpoFox.getLocalType(value))
					{
						case "string":
							prefBranch.setCharPref("", value);
							return true;
						case "int":
							prefBranch.setIntPref("", value);
							return true;
						case "bool":
						if ( value == "false" ){
							prefBranch.setBoolPref("", false);
						}else{
							prefBranch.setBoolPref("", true);
						}
							return true;
						default:
							return false;
					}
			}
			return null;
	},
	
	//Set a FF preference
	//will call setLockPref or setUserPref depending on if locked is set to true or false
	setPref : function(type,locked){
		if(locked){
			gpoFox.setLockPref(type);
		}
		else{
			gpoFox.setUserPref(type);
		}
	},
	
	//set a FF locked preference
	setLockPref : function(type){
		gpoFox.reg.open(type,gpoFox.basePath + "\\" + gpoFox.lockedPath,gpoFox.reg.ACCESS_READ);
		for (var i = 0; i < gpoFox.reg.valueCount; i++)
		{
			var prefName = gpoFox.reg.getValueName(i);
			var FirefoxSetter = gpoFox.readRegistryValue(prefName);
			gpoFox.writePrefValue(prefName,FirefoxSetter,true);
		}
		gpoFox.reg.close();
	},

getLocalType : function(value){
		var returnValue = "string";
		if ( value == "true" || value == "false" ){
			return "bool"
		}else{
			try{
				if (value > -1 ){
					return "int"
				}
			}catch(ex){}
		}
		return returnValue;
	},
	
	//Main function
	gpofirefox : function(){
		try {
			//set locked preferences from computer GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.lockedPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,true);
			}
			//set user preferences from computer GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.defaultPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_LOCAL_MACHINE,false);
			}
			//set locked preferences from user GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.lockedPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,true);
			}
			//set user preferences from user GPO
			gpoFox.reg.open(gpoFox.reg.ROOT_KEY_CURRENT_USER,gpoFox.basePath,gpoFox.reg.ACCESS_READ);
			if(gpoFox.reg.hasChild(gpoFox.defaultPath)){
				gpoFox.setPref(gpoFox.reg.ROOT_KEY_CURRENT_USER,false);
			}
		}catch(ex){}
	},

window.addEventListener("load",function(e){gpoFox.onLoad(e);},false);