corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out bug 431098

Browse Source
This commit is contained in:
Jonas Sicking
2009-08-10 16:40:29 -07:00
parent 29929f58b3
commit 7c7f57703f
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
layout/forms/nsFileControlFrame.cpp
View File

@@ -338,6 +338,8 @@ nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
result = filePicker->Show(&mode);
if (NS_FAILED(result))
return result;
if (mode == nsIFilePicker::returnCancel)
return NS_OK;
if (!mFrame) {
// The frame got destroyed while the filepicker was up. Don't do
@@ -348,35 +350,30 @@ nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
}
// Set property
nsAutoString unicodePath;
nsCOMPtr<nsILocalFile> localFile;
if (mode != nsIFilePicker::returnCancel) {
result = filePicker->GetFile(getter_AddRefs(localFile));
if (localFile) {
result = localFile->GetPath(unicodePath);
result = filePicker->GetFile(getter_AddRefs(localFile));
if (localFile) {
nsAutoString unicodePath;
result = localFile->GetPath(unicodePath);
if (!unicodePath.IsEmpty()) {
// Tell mTextFrame that this update of the value is a user initiated
// change. Otherwise it'll think that the value is being set by a script
// and not fire onchange when it should.
PRBool oldState = mFrame->mTextFrame->GetFireChangeEventState();
mFrame->mTextFrame->SetFireChangeEventState(PR_TRUE);
nsCOMPtr<nsIFileControlElement> fileControl = do_QueryInterface(content);
if (fileControl) {
fileControl->SetFileName(unicodePath);
}
mFrame->mTextFrame->SetFireChangeEventState(oldState);
// May need to fire an onchange here
mFrame->mTextFrame->CheckFireOnChange();
return NS_OK;
}
}
nsAutoString oldFileName;
nsCOMPtr<nsIFileControlElement> fileControl = do_QueryInterface(content);
NS_ENSURE_TRUE(fileControl, NS_ERROR_UNEXPECTED);
fileControl->GetFileName(oldFileName);
if (!unicodePath.Equals(oldFileName)) {
// Tell mTextFrame that this update of the value is a user initiated
// change. Otherwise it'll think that the value is being set by a script
// and not fire onchange when it should.
PRBool oldState = mFrame->mTextFrame->GetFireChangeEventState();
mFrame->mTextFrame->SetFireChangeEventState(PR_TRUE);
fileControl->SetFileName(unicodePath);
mFrame->mTextFrame->SetFireChangeEventState(oldState);
// May need to fire an onchange here
mFrame->mTextFrame->CheckFireOnChange();
}
return NS_OK;
return NS_FAILED(result) ? result : NS_ERROR_FAILURE;
}
nscoord