Show
Ignore:
Timestamp:
05/10/09 13:04:47 (6 years ago)
Author:
thorikawa
Message:

fix #158,#159

Location:
platform/firefox/FireMobileSimulator/branches/1.1.X/src
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • platform/firefox/FireMobileSimulator/branches/1.1.X/src/chrome/content/about.xul

    r32294 r33209  
    2828<vbox> 
    2929  <label value="FireMobileSimulator" style="font-weight: bold; font-size: x-large;"/> 
    30   <label value="&version; 1.1.3"/> 
     30  <label value="&version; 1.1.4"/> 
    3131  <separator class="thin"/> 
    3232  <label value="&createdBy;" style="font-weight: bold;"/> 
  • platform/firefox/FireMobileSimulator/branches/1.1.X/src/chrome/content/common/carrier.js

    r29755 r33209  
    121121firemobilesimulator.common.carrier.getDoCoMoUserAgent = function(useragent, id) { 
    122122        var type1 = parent.firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".type1"); 
    123         var cache = parent.firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".cache"); 
     123        var cache = parent.firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".cache") || 100; 
    124124        if (firemobilesimulator.common.carrier.Type[firemobilesimulator.common.carrier.DOCOMO].DOCOMO_FOMA == type1) { 
    125125                //TODO ;TB;WxxHxxの部分も動的に組み立てられるようにする 
  • platform/firefox/FireMobileSimulator/branches/1.1.X/src/chrome/content/contentHandler.js

    r29357 r33209  
    2828firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.AU] = firemobilesimulator.contentHandler.au; 
    2929firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.SOFTBANK] = firemobilesimulator.contentHandler.softbank; 
     30firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.OTHER] = firemobilesimulator.contentHandler.common; 
    3031 
    3132firemobilesimulator.contentHandler.factory = function (carrier) { 
  • platform/firefox/FireMobileSimulator/branches/1.1.X/src/chrome/content/options/dialogs/device.js

    r27274 r33209  
    106106                var carrier = firemobilesimulator.options.dialogs.device.carrier; 
    107107 
     108                var deviceName = document.getElementById("msim.options.device.label").value; 
     109                var userAgent = document.getElementById("msim.options.device.useragent").value; 
     110                var si = document.getElementById("msim.options.device.type.menulist").selectedItem; 
     111                var type1 = si ? si.getAttribute("label") : null; 
     112                var screenWidth = document.getElementById("msim.options.device.screen-width").value; 
     113                var screenHeight = document.getElementById("msim.options.device.screen-height").value; 
     114 
     115                // 入力チェック 
     116                if (!deviceName || !carrier || !userAgent) { 
     117                        dump("[msim]Warning : Required field is null.\n"); 
     118                        alert(firemobilesimulator.options.dialogs.device.stringBundle 
     119                                        .getString("msim_editDeviceRequirementValidation")); 
     120                        return false; 
     121                } 
     122 
    108123                if (firemobilesimulator.options.dialogs.device.windowType == "add") { 
    109124                        // carrier = 
     
    116131                } 
    117132 
    118                 dump("save-carrier:" + carrier + "\n"); 
    119                 dump("save-id:" + saveId + "\n"); 
    120  
    121                 var deviceName = document.getElementById("msim.options.device.label").value; 
    122                 var userAgent = document.getElementById("msim.options.device.useragent").value; 
    123                 var type1 = document.getElementById("msim.options.device.type.menulist").selectedItem.getAttribute("label"); 
    124                 var screenWidth = document.getElementById("msim.options.device.screen-width").value; 
    125                 var screenHeight = document.getElementById("msim.options.device.screen-height").value; 
    126  
    127                 // 入力チェック 
    128                 if (!deviceName || !carrier || !userAgent) { 
    129                         dump("[msim]Warning : Required field is null.\n"); 
    130                         alert(firemobilesimulator.options.dialogs.device.stringBundle 
    131                                         .getString("msim_editDeviceRequirementValidation")); 
    132                         return false; 
    133                 } 
     133                //dump("save-carrier:" + carrier + "\n"); 
     134                //dump("save-id:" + saveId + "\n"); 
     135 
    134136                firemobilesimulator.common.pref.setUnicharPref("msim.devicelist." + saveId + ".label", deviceName); 
    135137                firemobilesimulator.common.pref.setUnicharPref("msim.devicelist." + saveId + ".carrier", carrier); 
  • platform/firefox/FireMobileSimulator/branches/1.1.X/src/install.rdf

    r32294 r33209  
    55    <em:id>{77cc852e-6b45-11dd-929f-d30256d89593}</em:id> 
    66    <em:name>FireMobileSimulator</em:name> 
    7     <em:version>1.1.3</em:version> 
     7    <em:version>1.1.4</em:version> 
    88    <em:creator>Takahiro Horikawa</em:creator> 
    99    <em:aboutURL>chrome://msim/content/about.xul</em:aboutURL> 
     
    1313        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox --> 
    1414        <em:minVersion>2.0</em:minVersion> 
    15         <em:maxVersion>3.1.*</em:maxVersion> 
     15        <em:maxVersion>3.5.*</em:maxVersion> 
    1616      </Description> 
    1717    </em:targetApplication>