From 0b8014ee11356fb557dcefee2b6a8aed26a118a1 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@open-sankore.org>
Date: Thu, 16 Aug 2012 15:24:19 +0200
Subject: [PATCH] fixed issue 994

---
 src/gui/UBFeaturesWidget.cpp | 23 ++++++++++++++---------
 src/gui/UBFeaturesWidget.h   |  1 +
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index d221950b..4d067c8c 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -107,7 +107,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
     QString objName = sender()->objectName();
 
     if (objName.isEmpty()) {
-        qWarning() << "incorrrect sender";
+        qWarning() << "incorrect sender";
     } else if (objName == objNamePathList) {
         //Calling to reset the model for listView. Maybe separate function needed
         controller->searchStarted("", centralWidget->listView());
@@ -478,12 +478,12 @@ UBFeaturesCentralWidget::UBFeaturesCentralWidget(QWidget *parent) : QWidget(pare
     //Used to show search bar on the search widget
     webView = new UBFeaturesWebView(this);
 
-        //filling stackwidget
-        mStackedWidget->addWidget(mNavigator);
-        mStackedWidget->addWidget(mFeatureProperties);
-        mStackedWidget->addWidget(webView);
-        mStackedWidget->setCurrentIndex(MainList);
-        mStackedWidget->setContentsMargins(0, 0, 0, 0);
+    //filling stackwidget
+    mStackedWidget->addWidget(mNavigator);
+    mStackedWidget->addWidget(mFeatureProperties);
+    mStackedWidget->addWidget(webView);
+    mStackedWidget->setCurrentIndex(MainList);
+    mStackedWidget->setContentsMargins(0, 0, 0, 0);
 
 
     mAdditionalDataContainer = new QStackedWidget(this);
@@ -542,7 +542,7 @@ void UBFeaturesCentralWidget::setPropertiesThumbnail(const QPixmap &pix)
 
 UBFeature UBFeaturesCentralWidget::getCurElementFromProperties()
 {
-    return mFeatureProperties->getCurrentElement();
+	return mFeatureProperties->getCurrentElement();
 }
 
 void UBFeaturesCentralWidget::showAdditionalData(AddWidget pWidgetType, AddWidgetState pState)
@@ -732,7 +732,7 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
     mpView->setObjectName("SearchEngineView");
     mpSankoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
     mpView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mpSankoreAPI);
-
+    connect(mpView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
     mpWebSettings = QWebSettings::globalSettings();
     mpWebSettings->setAttribute(QWebSettings::JavaEnabled, true);
     mpWebSettings->setAttribute(QWebSettings::PluginsEnabled, true);
@@ -767,6 +767,11 @@ UBFeaturesWebView::~UBFeaturesWebView()
     }
 }
 
+void UBFeaturesWebView::javaScriptWindowObjectCleared()
+{
+    mpView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mpSankoreAPI);
+}
+
 void UBFeaturesWebView::showElement(const UBFeature &elem)
 {
 	QString qsWidgetName;
diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h
index 5a1b987e..a1fb87e0 100644
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@@ -288,6 +288,7 @@ public:
 
 private slots:
     void onLoadFinished(bool ok);
+    void javaScriptWindowObjectCleared();
 
 private:
     QWebView* mpView;