mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 3187: Add frame notification on option creation and destruction.

This commit is contained in:
pollmann%netscape.com 1999-05-19 03:46:25 +00:00
Родитель 4e14d84a86
Коммит 86300d4555
2 изменённых файлов: 48 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
content/html/content/src/nsHTMLSelectElement.cpp
Просмотреть файл

@ -542,17 +542,39 @@ nsHTMLSelectElement::AddOption(nsIContent* aContent)
mOptions->AddOption(aContent);
}
// Update the widget
nsIFormControlFrame* selectFrame = nsnull;
nsresult result = nsGenericHTMLElement::GetPrimaryFrame(this, selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
nsString action("a");
action.Append(mOptions->IndexOf(aContent),10);
selectFrame->SetProperty(nsHTMLAtoms::option, action);
}
// When first populating, GetPrimaryFrame will fail but it's ok
return NS_OK;
}
NS_IMETHODIMP
nsHTMLSelectElement::RemoveOption(nsIContent* aContent)
{
// We can't get our index if we've already been replaced in the OptionList.
// If we couldn't get our index, pass -1, remove all options and recreate
PRInt32 index = mOptions->IndexOf(aContent);
if (nsnull != mOptions) {
mOptions->RemoveOption(aContent);
}
return NS_OK;
// Update the widget
nsIFormControlFrame* selectFrame = nsnull;
nsresult result = nsGenericHTMLElement::GetPrimaryFrame(this, selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
nsString action("r");
action.Append(index,10);
selectFrame->SetProperty(nsHTMLAtoms::option, action);
}
return result;
}
NS_IMETHODIMP
@ -902,7 +924,7 @@ nsOptionList::SetProperty(JSContext *aContext,
PRInt32 length = mElements.Count();
// If the index is within range
if ((index > 0) && (index <= length)) {
if ((index >= 0) && (index <= length)) {
// if the value is null, remove this option
if (JSVAL_IS_NULL(*aVp)) {

26
layout/html/content/src/nsHTMLSelectElement.cpp
Просмотреть файл

@ -542,17 +542,39 @@ nsHTMLSelectElement::AddOption(nsIContent* aContent)
mOptions->AddOption(aContent);
}
// Update the widget
nsIFormControlFrame* selectFrame = nsnull;
nsresult result = nsGenericHTMLElement::GetPrimaryFrame(this, selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
nsString action("a");
action.Append(mOptions->IndexOf(aContent),10);
selectFrame->SetProperty(nsHTMLAtoms::option, action);
}
// When first populating, GetPrimaryFrame will fail but it's ok
return NS_OK;
}
NS_IMETHODIMP
nsHTMLSelectElement::RemoveOption(nsIContent* aContent)
{
// We can't get our index if we've already been replaced in the OptionList.
// If we couldn't get our index, pass -1, remove all options and recreate
PRInt32 index = mOptions->IndexOf(aContent);
if (nsnull != mOptions) {
mOptions->RemoveOption(aContent);
}
return NS_OK;
// Update the widget
nsIFormControlFrame* selectFrame = nsnull;
nsresult result = nsGenericHTMLElement::GetPrimaryFrame(this, selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
nsString action("r");
action.Append(index,10);
selectFrame->SetProperty(nsHTMLAtoms::option, action);
}
return result;
}
NS_IMETHODIMP
@ -902,7 +924,7 @@ nsOptionList::SetProperty(JSContext *aContext,
PRInt32 length = mElements.Count();
// If the index is within range
if ((index > 0) && (index <= length)) {
if ((index >= 0) && (index <= length)) {
// if the value is null, remove this option
if (JSVAL_IS_NULL(*aVp)) {