generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 19:25:53 +02:00
Code Issues Projects Releases Wiki Activity

fixed deps

Browse Source
This commit is contained in:
Peter Schojer
2008-10-06 07:12:44 +00:00
parent 357d571561
commit 442f575356
3 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
WebWidgets/ExtJS/src/DynamicCodeLoaderRenderer.cpp
View File

@@ -70,7 +70,6 @@ void DynamicCodeLoaderRenderer::renderHead(const Renderable* pRenderable, const
// - second, the js file which must be set as code at the DynamicCodeLoader
const DynamicCodeLoader* pLoader = static_cast<const DynamicCodeLoader*>(pRenderable);
View::Ptr pView = pLoader->view();
Panel::Ptr pPanel = pView.cast<Panel>();
poco_assert_dbg (pLoader != 0);
str << "function " << pLoader->loaderFunctionName() << "(ignoreSuccess){" << std::endl;
@@ -81,10 +80,7 @@ void DynamicCodeLoaderRenderer::renderHead(const Renderable* pRenderable, const
str << RequestHandler::KEY_ID << "=" << pLoader->id() << "'," << std::endl;
str << "success: function(response){" << std::endl;
str << "loadScriptDynamically('script" << pLoader->id() << "', response);" << std::endl;
if (pPanel)
str << "var parent = Ext.getCmp('" << pPanel->id() << "');" << std::endl;
else
str << "var parent = Ext.getCmp('" << pLoader->parent()->id() << "');" << std::endl;
str << "var parent = Ext.getCmp('" << pLoader->parent()->id() << "');" << std::endl;
str << "var child = " << pLoader->functionName() << "();" << std::endl;
str << "parent.add(child);" << std::endl;
// reduce the missing child cnt for all parents
@@ -97,8 +93,9 @@ void DynamicCodeLoaderRenderer::renderHead(const Renderable* pRenderable, const
}
if (!pLoader->getSuccessCall().empty())
{
str << "if (!ignoreSuccess)" << std::endl;
str << "if (!ignoreSuccess){" << std::endl;
str << pLoader->getSuccessCall() << ";" << std::endl;
str << "}" << std::endl;
}
str << "}";
if (!pLoader->getErrorCall().empty())
@@ -112,7 +109,7 @@ void DynamicCodeLoaderRenderer::renderHead(const Renderable* pRenderable, const
// write the Check function
str << "function " << pLoader->loaderFunctionName() << "Check(){" << std::endl;
str << "if (" << pLoader->loaderFunctionName() << "MissingChildCnt <= 0){" << std::endl;
str << pLoader->loaderFunctionName() << "(false);" << std::endl;
str << pLoader->loaderFunctionName() << "(" << pLoader->loaderFunctionName() << "IgnoreSuccess);" << std::endl;
str << "window.clearInterval(" << pLoader->loaderFunctionName() << "PeriodicCheck);" << std::endl;
str << "}";
str << pLoader->loaderFunctionName() << "RetryCnt--;" << std::endl;
@@ -127,6 +124,7 @@ void DynamicCodeLoaderRenderer::renderHead(const Renderable* pRenderable, const
std::vector<const DynamicCodeLoader*>::const_iterator it = deps.begin();
str << "function " << pLoader->loadAllFunctionName() << "(ignoreParentSuccess, ignoreChildSuccess){" << std::endl;
str << pLoader->loaderFunctionName() << "IgnoreSuccess = ignoreParentSuccess;" << std::endl;
for (; it != deps.end(); ++it)
{
if (*it)
@@ -158,6 +156,7 @@ void DynamicCodeLoaderRenderer::renderVariables(const DynamicCodeLoader* pLoader
str << "var " << pLoader->loaderFunctionName() << "PeriodicCheck;" << std::endl;
str << "var " << pLoader->loaderFunctionName() << "RetryCnt = 60;" << std::endl;
str << "var " << pLoader->loaderFunctionName() << "MissingChildCnt = " << pLoader->dependencies().size() << ";" << std::endl;
str << "var " << pLoader->loaderFunctionName() << "IgnoreSuccess;" << std::endl;
}
}
@@ -178,14 +177,8 @@ void DynamicCodeLoaderRenderer::onCodeGen(DynamicCodeLoader* &pL)
out << "function " << pL->functionName() << "(){";
out << "return ";
// only render the child when we have a panel
if (pPanel)
{
AutoPtr<PanelRenderer> pRend = new PanelRenderer();
pRend->renderAsPanelChild(pPanel, context, out);
}
else
pView->renderHead(context, out);
pView->renderHead(context, out);
out << ";"; // close return
out << "}";

23
WebWidgets/ExtJS/src/PageRenderer.cpp
View File

@@ -201,29 +201,12 @@ void PageRenderer::renderHead(const Renderable* pRenderable, const RenderContext
ostr << ",items:[";
// write an empty hull for the dynamiccodeloadres: solves z-seed problem
std::set<DynamicCodeLoader::Ptr>::const_iterator itDCL = dcls.begin();
AutoPtr<PanelRenderer> pPanelRenderer(new PanelRenderer());
bool writeComma = false;
for (; itDCL != dcls.end(); ++itDCL)
{
View::Ptr pView = (*itDCL)->view();
AutoPtr<Panel> pPanel = pView.cast<Panel>();
if (pPanel)
{
if (writeComma)
{
ostr << ",";
}
pPanelRenderer->renderHeadWithoutChildren(pPanel, context, ostr);
writeComma = true;
}
}
// NOTE: not really, as soon as you have scrolling in one of the children the problem is back
//process all children
ContainerView::ConstIterator it = pPage->begin();
ContainerView::ConstIterator itEnd = pPage->end();
if (!dcls.empty() && it != itEnd)
ostr << ",";
for (; it != itEnd; ++it)
{
if (it != pPage->begin())