fixed trap flash issue

src/board/UBBoardController.cpp

@@ -959,7 +959,7 @@ void UBBoardController::groupButtonClicked()
     }
 
     if (groupAction->text() == mActionGroupText) { //The only way to get information from item, considering using smth else
-    	UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems);
+        UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems);
         groupItem->setSelected(true);
         UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
 
@@ -1029,12 +1029,17 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c
     }
     else
     {
+        QString urlString = url.toString();
+        int parametersStringPosition = urlString.indexOf("?");
+        if(parametersStringPosition != -1)
+            urlString = urlString.left(parametersStringPosition);
+
         // When we fall there, it means that we are dropping something from the web to the board
         sDownloadFileDesc desc;
         desc.modal = true;
-        desc.srcUrl = url.toString();
+        desc.srcUrl = urlString;
         desc.currentSize = 0;
-        desc.name = QFileInfo(url.toString()).fileName();
+        desc.name = QFileInfo(urlString).fileName();
         desc.totalSize = 0; // The total size will be retrieved during the download
         desc.pos = pPos;
         desc.size = pSize;
@@ -2273,10 +2278,10 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
         {
             foreach(UBItem* item, mimeData->items())
             {
-            	QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(item);
-            	if(NULL != pItem){
-            		duplicateItem(item);
-            	}
+                QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(item);
+                if(NULL != pItem){
+                    duplicateItem(item);
+                }
             }
 
             return;

src/web/UBTrapFlashController.cpp

@@ -204,7 +204,7 @@ void UBTrapFlashController::createWidget()
     }
 
     QString freezedWidgetPath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/freezedWidgetWrapper.html";
-	mTrapFlashUi->webView->load(QUrl::fromLocalFile(freezedWidgetPath));
+    mTrapFlashUi->webView->load(QUrl::fromLocalFile(freezedWidgetPath));
 
     mTrapFlashDialog->hide();
 }
@@ -370,6 +370,7 @@ QString UBTrapFlashController::generateFullPageHtml(const QString& pDirPath, boo
 QString UBTrapFlashController::generateHtml(const UBWebKitUtils::HtmlObject& pObject,
         const QString& pDirPath, bool pGenerateFile)
 {
+    qDebug() << pObject.source;
     QUrl objectUrl(pObject.source);
     QString objectFullUrl = pObject.source;
     if (!objectUrl.isValid())
@@ -471,9 +472,13 @@ QString UBTrapFlashController::generateHtml(const UBWebKitUtils::HtmlObject& pOb
 
 QString UBTrapFlashController::widgetNameForObject(UBWebKitUtils::HtmlObject pObject)
 {
-    int lastSlashIndex = pObject.source.lastIndexOf("/");
+    QString url = pObject.source;
+    int parametersIndex = url.indexOf("?");
+    if(parametersIndex != -1)
+        url = url.left(parametersIndex);
+    int lastSlashIndex = url.lastIndexOf("/");
 
-    QString result = pObject.source.right(pObject.source.length() - lastSlashIndex);
+    QString result = url.right(url.length() - lastSlashIndex);
     result = UBFileSystemUtils::cleanName(result);
 
     return result;