fixed some merge problems

This commit is contained in:
Ray Vahey
2009-03-09 09:45:35 +07:00
parent a463aa2400
commit dfa2f0a802
4 changed files with 69 additions and 97 deletions
+33 -38
View File
@@ -111,19 +111,22 @@ http = function(func)
fileManagement = function(x){
if (x == 'testSDCard'){
$('file_status').value = Device.storage.testSDCard();
$('file_status').value = Device.file.testSaveLocationExists();
}else
if (x == 'testExistence'){
$('file_status').value = Device.storage.testExistence($('checkfile').value);
if (x == 'testFileExists'){
$('file_status').value = Device.file.testFileExists($('checkfile').value);
}else
if (x == 'testDirectoryExists'){
$('file_status').value = Device.file.testDirectoryExists($('checkdir').value);
}else
if (x == 'createDir'){
$('file_status').value = Device.storage.createDir($('createfile').value);
$('file_status').value = Device.file.createDirectory($('createfile').value);
}else
if (x == 'delFile'){
$('file_status').value = Device.storage.delFile($('delfile').value);
$('file_status').value = Device.file.deleteFile($('delfile').value);
}else
if (x == 'delDir'){
$('file_status').value = Device.storage.delDir($('deldir').value);
$('file_status').value = Device.file.deleteDirectory($('deldir').value);
}
}
@@ -191,7 +194,7 @@ addLoadEvent(initGap);
<li><a href="#audio" onclick="audio();">Audio...</a></li>
<li><a href="#notification" onclick="notification();">Notification...</a></li>
<li><a href="#http" onclick="http();">HTTP...</a></li>
<li><a href="#esm" onclick="">External Storage</a></li>
<li><a href="#file" onclick="">File IO...</a></li>
<li><a href="#pi" onclick="phInformation();">Phone Info...</a></li>
<li><a href="http://phonegap.com/" target="_self">About</a></li>
</ul>
@@ -341,19 +344,23 @@ addLoadEvent(initGap);
</fieldset>
</div>
<div id="esm" title="Storage" class="panel" >
<h2>Storage Management</h2>
<div id="file" title="file IO" class="panel" >
<h2>file IO</h2>
<fieldset>
<div class="row">
<label>File Status</label>
<label>File IO</label>
<input disabled="enabled" name="file_status" id="file_status" value="" type="text"></input>
</div>
<div class="row">
<a class="button leftButton" type="submit" onclick="fileManagement('testSDCard');">Check Status</a>
<a class="button leftButton" type="submit" onclick="fileManagement('testSDCard');">testSaveLocation</a>
</div>
<div class="row">
<a class="button leftButton" type="submit" onclick="fileManagement('testExistence')">Check File</a>
<a class="button leftButton" type="submit" onclick="fileManagement('testFileExists')">testFileExists</a>
<input type=text name="checkfile" id="checkfile" size=60 maxlength=2048 value="" style="width: 30ex"></input>
</div>
<div class="row">
<a class="button leftButton" type="submit" onclick="fileManagement('testDirectoryExists')">testDirExists</a>
<input type=text name="checkdir" id="checkdir" size=60 maxlength=2048 value="" style="width: 30ex"></input>
</div>
<div class="row">
<a class="button leftButton" type="submit" onclick="fileManagement('createDir');">Create Directory</a>
@@ -374,44 +381,32 @@ addLoadEvent(initGap);
<h2>Audio</h2>
<fieldset>
<div class="row">
<label>AudioFile:</label>
<input type=text name="audioFile" id="audioFile" size=60 maxlength=2048 value="/hullophonegap.mp3" style="width: 30ex"></input>
<label>AudioFile:</label>
<input type=text name="audioFile" id="audioFile" size=60 maxlength=2048 value="/hullophonegap.mp3" style="width: 30ex"></input>
</div>
</fieldset>
<fieldset>
<div class="row">
<a class="button leftButton" type="submit" onclick="audio('startRecording');">startRecording</a>
<a class="button blueButton" type="submit" onclick="audio('stopRecording');">stopRecording</a>
<a class="button leftButton" type="submit" onclick="audio('startRecording');">startRecording</a>
<a class="button blueButton" type="submit" onclick="audio('stopRecording');">stopRecording</a>
</div>
</fieldset>
<fieldset>
<div class="row">
<a class="button leftButton" type="submit" onclick="audio('startPlaying');">startPlaying</a>
<a class="button blueButton" type="submit" onclick="audio('stopPlaying');">stopPlaying</a>
<a class="button leftButton" type="submit" onclick="audio('startPlaying');">startPlaying</a>
<a class="button blueButton" type="submit" onclick="audio('stopPlaying');">stopPlaying</a>
</div>
</fieldset>
<fieldset>
<div class="row">
<label>info:</label>
<input disabled="enabled" id="posdur" type="text" />
<label>info:</label>
<input disabled="enabled" id="posdur" type="text" />
</div>
</fieldset>
<fieldset>
<div class="row">
<a class="button leftButton" type="submit" onclick="audio('getDuration');">getDuration</a>
<a class="button blueButton" type="submit" onclick="audio('getCurrentPosition');">getPosition</a>
<a class="button leftButton" type="submit" onclick="audio('getDuration');">getDuration</a>
<a class="button blueButton" type="submit" onclick="audio('getCurrentPosition');">getPosition</a>
</div>
</fieldset>
<fieldset>
<div class="row">
<a class="button leftButton" type="submit" onclick="audio('setEarpiece');">Earpiece</a>
<a class="button blueButton" type="submit" onclick="audio('setSpeaker');">Speaker</a>
<a class="button leftButton" type="submit" onclick="audio('setEarpiece');">Earpiece</a>
<a class="button blueButton" type="submit" onclick="audio('setSpeaker');">Speaker</a>
</div>
</fieldset>
<fieldset>
<div class="row">
<a class="button leftButton" type="submit" onclick="audio('getAudioOutputDevice');">Audio Output</a>
<input disabled="enabled" id="audoutput" type="text" style="width: 30ex"/>
<a class="button leftButton" type="submit" onclick="audio('getAudioOutputDevice');">getAudioDevice</a>
<input disabled="enabled" id="audoutput" type="text" style="width: 30ex"/>
</div>
</fieldset>
</div>