* 設定名を register に変更しました。

* `map()` の件ごめんなさい……。 * 改行コードの混在を修正しました。 * ほか。 git-svn-id: http://svn.coderepos.org/share/platform/firefox/FireMobileSimulator/trunk@20324 d0d07461-0603-4401-acd4-de1884942a52
thorikawa · Sep 30, 2008 · 11edf8a · 11edf8a
1 parent e5db45b
commit 11edf8a
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 121 deletions.
diff --git a/src/chrome/content/common/carrier.js b/src/chrome/content/common/carrier.js
@@ -75,6 +75,6 @@ firemobilesimulator.common.carrier.getSoftBankUserAgent = function(useragent, se
 	}
 	dump("SB UA:" + useragent + "\n");
 	return useragent;
-}
+};
 
 dump("carrier.js is loaded.\n");
diff --git a/src/chrome/content/common/util.js b/src/chrome/content/common/util.js
@@ -40,7 +40,7 @@ firemobilesimulator.common.util.openURL = function(url) {
 				.addTab(url);
 		window.close();
 	}
-}
+};
 
 /**
  * 
@@ -55,7 +55,7 @@ firemobilesimulator.common.util.getParamsFromPath = function(path, func){
 		params = firemobilesimulator.common.util.getParamsFromQuery(path.substring(qindex+1), func);
 	}
 	return params;
-}
+};
 
 /**
  * 
@@ -85,7 +85,7 @@ firemobilesimulator.common.util.getParamsFromQuery = function(q, func){
 		params["" + v.substring(0,eindex)] = "" + value;
 	});
 	return params;
-}
+};
 
 /**
  * 位置情報オブジェクト
@@ -149,7 +149,7 @@ firemobilesimulator.common.util.dms2degree = function(dms){
 	var dms3 = parseFloat(RegExp.$3);
 	var degree = dms1+dms2/60+dms3/3600;
 	return degree;
-}
+};
 
 /**
  * degree(度)をdms(時分秒)に変換する
@@ -164,7 +164,7 @@ firemobilesimulator.common.util.degree2dms = function(degree){
 	var d = parseInt(u/3600/n);
 	var u = u % n;
 	return d+"."+m.toString().padding("0",2)+"."+s.toString().padding("0",2)+"."+u;
-}
+};
 
 /**
  * 指定された文字列で指定された長さになるまで埋めます
@@ -178,7 +178,7 @@ String.prototype.padding = function(pad, len){
 		newString = pad+newString;
 	}
 	return new String(newString);
-}
+};
 
 firemobilesimulator.common.util.getYYYYMMDDHHmm = function(){
 	var now = new Date();
@@ -188,7 +188,7 @@ firemobilesimulator.common.util.getYYYYMMDDHHmm = function(){
 	var h = now.getHours().toString().padding("0",2);
 	var min = now.getMinutes().toString().padding("0",2);
 	return y+m+d+h+min;
-}
+};
 
 firemobilesimulator.common.util.getHiddenTag = function(params){
 	var r = "";
@@ -199,4 +199,4 @@ firemobilesimulator.common.util.getHiddenTag = function(params){
 		r += '<input type="hidden" name="'+i+'" value="'+params[i]+'" />\n';
 	}
 	return r;
-}
+};
diff --git a/src/chrome/content/html/au_gps.js b/src/chrome/content/html/au_gps.js
@@ -64,4 +64,4 @@ firemobilesimulator.auLocationInit = function(params) {
 	var ngButton = document.getElementById("ngbutton");
 	okButton.onclick = function(){location.href=okUrl};
 	ngButton.onclick = function(){location.href=ngUrl};
-}
+};
diff --git a/src/chrome/content/html/dc_openiarea.js b/src/chrome/content/html/dc_openiarea.js
@@ -76,4 +76,4 @@ body += '\
 ';
 		openiareaBody.innerHTML = body;
 	}
-}
+};
diff --git a/src/chrome/content/mpc/common.js b/src/chrome/content/mpc/common.js
@@ -76,7 +76,7 @@ firemobilesimulator.mpc.common.unpack = function(str) {
 		// dump("[unpack]"+str.charCodeAt(i)+":"+ret[i]+"\n");
 	}
 	return ret;
-}
+};
 
 firemobilesimulator.mpc.common.sdecs2udec = function(chs) {
 	var hex = "";
@@ -91,7 +91,7 @@ firemobilesimulator.mpc.common.sdecs2udec = function(chs) {
 	} else {
 		return undefined;
 	}
-}
+};
 
 firemobilesimulator.mpc.common.u8decs2udec = function(chs) {
 	var hex = "";
@@ -106,7 +106,7 @@ firemobilesimulator.mpc.common.u8decs2udec = function(chs) {
 	} else {
 		return undefined;
 	}
-}
+};
 
 firemobilesimulator.mpc.common.utf82unicode = function(bits) {
 	var rbits = new Array(2);
@@ -120,7 +120,7 @@ firemobilesimulator.mpc.common.utf82unicode = function(bits) {
 		dump("NOT IMPLEMENTED!\n");
 	}
 	return rbits;
-}
+};
 
 firemobilesimulator.mpc.common.unicode2utf8 = function(bits){
 	var rbits = new Array(3);
@@ -132,7 +132,7 @@ firemobilesimulator.mpc.common.unicode2utf8 = function(bits){
 		dump("NOT IMPLEMENTED!\n");
 	}
 	return rbits;
-}
+};
 
 firemobilesimulator.mpc.common.bits2dec = function(bits) {
 	var r = 0;
@@ -144,6 +144,6 @@ firemobilesimulator.mpc.common.bits2dec = function(bits) {
 		//dump(bits[1].toString(16)+",return to:"+r+"\n");
 	//}
 	return r;
-}
+};
 
 dump("common.js is loaded.\n");
diff --git a/src/chrome/content/mpc/softbank.js b/src/chrome/content/mpc/softbank.js
@@ -22,8 +22,7 @@ if(!firemobilesimulator) firemobilesimulator = {};
 if(!firemobilesimulator.mpc) firemobilesimulator.mpc = {};
 
 firemobilesimulator.mpc.softbank = function(){};
-firemobilesimulator.mpc.softbank.prototype =
-{
+firemobilesimulator.mpc.softbank.prototype = {
 	/**
 	 * SoftBank絵文字画像格納パス
 	 *

diff --git a/src/chrome/content/options/dialogs/device.js b/src/chrome/content/options/dialogs/device.js
@@ -113,7 +113,7 @@ firemobilesimulator.options.dialogs.device.initializeDevice = function() {
 
 	}
 
-}
+};
 
 firemobilesimulator.options.dialogs.device.carrierSelected = function(obj) {
 	if (firemobilesimulator.options.dialogs.device.carrier) {
@@ -130,7 +130,7 @@ firemobilesimulator.options.dialogs.device.carrierSelected = function(obj) {
 				firemobilesimulator.options.dialogs.device.carrier, null);
 	}
 	window.sizeToContent();
-}
+};
 
 firemobilesimulator.options.dialogs.device.appendDeviceAttributeRows = function(
 		parentNode, carrier, id) {
@@ -160,7 +160,7 @@ firemobilesimulator.options.dialogs.device.appendDeviceAttributeRows = function(
 				r.appendChild(t);
 				parentNode.appendChild(r);
 			});
-}
+};
 
 firemobilesimulator.options.dialogs.device.removeDeviceAttributeRows = function(
 		parentNode) {
@@ -169,7 +169,7 @@ firemobilesimulator.options.dialogs.device.removeDeviceAttributeRows = function(
 		dump("remove:" + parentNode.lastChild.getAttribute("id") + "\n");
 		parentNode.removeChild(parentNode.lastChild);
 	}
-}
+};
 
 // Saves a device
 firemobilesimulator.options.dialogs.device.saveDevice = function() {
@@ -250,4 +250,4 @@ firemobilesimulator.options.dialogs.device.saveDevice = function() {
 				});
 	}
 	return true;
-}
+};
diff --git a/src/chrome/content/options/dialogs/device.xul b/src/chrome/content/options/dialogs/device.xul
@@ -9,7 +9,7 @@
 		ondialogcancel="javascript:false;"
 		onload="firemobilesimulator.options.dialogs.device.initializeDevice()"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
+
 	<script type="application/x-javascript" src="chrome://msim/content/core.js"/>
 	<script type="application/x-javascript" src="chrome://msim/content/common/pref.js"/>
 	<script type="application/x-javascript" src="chrome://msim/content/common/carrier.js"/>
@@ -36,14 +36,14 @@
 			<row id="msim.options.device.useragent.row" align="center">
 				<label control="msim.options.device.useragent" value="&msim.options.device.useragent;"/>
 				<textbox id="msim.options.device.useragent" size="50"/>
-			</row>
-			<row id="msim.options.device.screen-width.row" align="center">
-				<label control="msim.options.device.screen-width" value="&msim.options.device.screen-width;"/>
-				<textbox id="msim.options.device.screen-width" size="50"/>
-			</row>
-			<row id="msim.options.device.screen-height.row" align="center">
-				<label control="msim.options.device.screen-height" value="&msim.options.device.screen-height;"/>
-				<textbox id="msim.options.device.screen-height" size="50"/>
+			</row>
+			<row id="msim.options.device.screen-width.row" align="center">
+				<label control="msim.options.device.screen-width" value="&msim.options.device.screen-width;"/>
+				<textbox id="msim.options.device.screen-width" size="50"/>
+			</row>
+			<row id="msim.options.device.screen-height.row" align="center">
+				<label control="msim.options.device.screen-height" value="&msim.options.device.screen-height;"/>
+				<textbox id="msim.options.device.screen-height" size="50"/>
 			</row>
 		</rows>
 	</grid>

diff --git a/src/chrome/content/options/options.js b/src/chrome/content/options/options.js
@@ -41,13 +41,13 @@ firemobilesimulator.options.addDevice = function(){
 	}else{
 		dump("canceld?\n");
 	}
-}
+};
 
 //Handles changing the options page
 firemobilesimulator.options.changePage = function(pageList){
 	firemobilesimulator.options.storeOptions();
 	document.getElementById("msim-options-iframe").setAttribute("src", pageList.selectedItem.getAttribute("value"));
-}
+};
 
 //Deletes a device
 firemobilesimulator.options.deleteDevice = function(){
@@ -83,7 +83,7 @@ firemobilesimulator.options.deleteDevice = function(){
 
 		deviceBox.removeChild(selectedItem);
 	}
-}
+};
 
 //Edits a device
 firemobilesimulator.options.editDevice = function(){
@@ -105,7 +105,7 @@ firemobilesimulator.options.editDevice = function(){
 	}else{
 		dump("[msim]Error : Device is not selected.\n");
 	}
-}
+};
 
 // Initializes the options dialog box
 firemobilesimulator.options.initializeOptions = function(){
@@ -126,16 +126,14 @@ firemobilesimulator.options.initializeOptions = function(){
 }
 
 // Initializes the general page
-firemobilesimulator.options.initializeGeneral = function()
-{
+firemobilesimulator.options.initializeGeneral = function(){
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
 	pageDocument.getElementById("msim-checkbox-general-force-screen-width").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.general.force-screen-width");
 	pageDocument.getElementById("msim-checkbox-general-reset-device-onquit").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.general.reset-device-onquit");
-}
+};
 
 // Initializes the general page
-firemobilesimulator.options.initializeIdno = function()
-{
+firemobilesimulator.options.initializeIdno = function(){
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
 	pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.DC.uid"));
 	pageDocument.getElementById("msim-textbox-docomo-ser").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.DC.ser"));
@@ -144,7 +142,7 @@ firemobilesimulator.options.initializeIdno = function()
 	pageDocument.getElementById("msim-textbox-au-uid").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.AU.uid"));
 	pageDocument.getElementById("msim-textbox-softbank-uid").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.SB.uid"));
 	pageDocument.getElementById("msim-textbox-softbank-serial").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.SB.serial"));
-}
+};
 
 // Initializes the devices page
 firemobilesimulator.options.initializeDevices = function(){
@@ -173,7 +171,7 @@ firemobilesimulator.options.initializeDevices = function(){
 	});
 
 	firemobilesimulator.options.deviceSelected();
-}
+};
 
 // Saves the user's options
 firemobilesimulator.options.saveOptions = function(){
@@ -197,7 +195,7 @@ firemobilesimulator.options.saveOptions = function(){
 	for(option in firemobilesimulator.options.optionsDataString){
 		firemobilesimulator.common.pref.setUnicharPref(option, firemobilesimulator.options.optionsDataString[option]);
 	}
-}
+};
 
 // Stores the user's options to be saved later
 firemobilesimulator.options.storeOptions = function(){
@@ -208,8 +206,8 @@ firemobilesimulator.options.storeOptions = function(){
 	// If this is the general page
 	if(iFrameSrc.indexOf("general") != -1){
 		dump("[msim]store general.\n");
-		firemobilesimulator.options.optionsDataBoolean["msim.config.general.force-screen-width"]    = pageDocument.getElementById("msim-checkbox-general-force-screen-width").checked;
-		firemobilesimulator.options.optionsDataBoolean["msim.config.general.reset-device-onquit"]    = pageDocument.getElementById("msim-checkbox-general-reset-device-onquit").checked;
+		firemobilesimulator.options.optionsDataBoolean["msim.config.general.force-screen-width"]  = pageDocument.getElementById("msim-checkbox-general-force-screen-width").checked;
+		firemobilesimulator.options.optionsDataBoolean["msim.config.general.reset-device-onquit"] = pageDocument.getElementById("msim-checkbox-general-reset-device-onquit").checked;
 		//Nothing to do
 	}else if(iFrameSrc.indexOf("idno") != -1){
 		dump("[msim]store idno.\n");
@@ -233,20 +231,20 @@ firemobilesimulator.options.storeOptions = function(){
 		//Nothing to do
 	}else if(iFrameSrc.indexOf("gps") != -1){
 		dump("[msim]store gps.\n");
-		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.areacode"]    = pageDocument.getElementById("msim-textbox-docomo-gps-areacode").value;
-		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.areaname"]    = pageDocument.getElementById("msim-textbox-docomo-gps-areaname").value;
-		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.lat"]    = pageDocument.getElementById("msim-textbox-docomo-gps-lat").value;
-		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.lon"]    = pageDocument.getElementById("msim-textbox-docomo-gps-lon").value;
-		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.alt"]    = pageDocument.getElementById("msim-textbox-docomo-gps-alt").value;
-		firemobilesimulator.options.optionsDataString["msim.config.AU.gps.lat"]    = pageDocument.getElementById("msim-textbox-au-gps-lat").value;
-		firemobilesimulator.options.optionsDataString["msim.config.AU.gps.lon"]    = pageDocument.getElementById("msim-textbox-au-gps-lon").value;
+		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.areacode"] = pageDocument.getElementById("msim-textbox-docomo-gps-areacode").value;
+		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.areaname"] = pageDocument.getElementById("msim-textbox-docomo-gps-areaname").value;
+		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.lat"]      = pageDocument.getElementById("msim-textbox-docomo-gps-lat").value;
+		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.lon"]      = pageDocument.getElementById("msim-textbox-docomo-gps-lon").value;
+		firemobilesimulator.options.optionsDataString["msim.config.DC.gps.alt"]      = pageDocument.getElementById("msim-textbox-docomo-gps-alt").value;
+		firemobilesimulator.options.optionsDataString["msim.config.AU.gps.lat"]      = pageDocument.getElementById("msim-textbox-au-gps-lat").value;
+		firemobilesimulator.options.optionsDataString["msim.config.AU.gps.lon"]      = pageDocument.getElementById("msim-textbox-au-gps-lon").value;
 	}else if(iFrameSrc.indexOf("pictogram") != -1){
 		dump("[msim]store pictogram.\n");
-		firemobilesimulator.options.optionsDataBoolean["msim.config.DC.pictogram.enabled"]    = pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked;
-		firemobilesimulator.options.optionsDataBoolean["msim.config.AU.pictogram.enabled"]    = pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked;
-		firemobilesimulator.options.optionsDataBoolean["msim.config.SB.pictogram.enabled"]    = pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked;
+		firemobilesimulator.options.optionsDataBoolean["msim.config.DC.pictogram.enabled"] = pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked;
+		firemobilesimulator.options.optionsDataBoolean["msim.config.AU.pictogram.enabled"] = pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked;
+		firemobilesimulator.options.optionsDataBoolean["msim.config.SB.pictogram.enabled"] = pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked;
 	}
-}
+};
 
 // Called whenever the device box is selected
 firemobilesimulator.options.deviceSelected = function(){
@@ -260,7 +258,7 @@ firemobilesimulator.options.deviceSelected = function(){
 	}else{
 		editButton.disabled = true;
 	}
-}
+};
 
 firemobilesimulator.options.clearAllDeviceSettings = function(){
 	if(confirm(document.getElementById("msim-string-bundle").getString("msim_clearAllConfirmation"))){
@@ -289,7 +287,7 @@ firemobilesimulator.options.clearAllDeviceSettings = function(){
 	}
 
 	firemobilesimulator.options.initializeDevices();
-}
+};
 
 // Initializes the general page
 firemobilesimulator.options.initializeGps = function(){
@@ -301,12 +299,12 @@ firemobilesimulator.options.initializeGps = function(){
 	pageDocument.getElementById("msim-textbox-docomo-gps-alt").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.DC.gps.alt"));
 	pageDocument.getElementById("msim-textbox-au-gps-lat").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.AU.gps.lat"));
 	pageDocument.getElementById("msim-textbox-au-gps-lon").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.AU.gps.lon"));
-}
+};
 
 firemobilesimulator.options.initializePictogram = function(){
 	dump("[msim]initializePictogram.\n");
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
 	pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.DC.pictogram.enabled");
 	pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.AU.pictogram.enabled");
 	pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.SB.pictogram.enabled");
-}
+};