fix WFileUpload JS error in certain conditions

emweb · Jan 1, 2016 · d6daeb8 · d6daeb8
1 parent 946a943
commit d6daeb8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Wt/WFileUpload b/src/Wt/WFileUpload
@@ -356,9 +356,7 @@ protected:
 private:
   void handleFileTooLarge(::int64_t fileSize);
 
-
   void onUploaded();
-  ::int64_t tooLargeSize_;
 
   virtual void setFormData(const FormData& formData);
   void setFiles(const std::vector<Http::UploadedFile>& files);

diff --git a/src/Wt/WFileUpload.C b/src/Wt/WFileUpload.C
@@ -84,6 +84,8 @@ protected:
       } else if (request.tooLarge()) {
         LOG_DEBUG("Resource handleRequest(): signaling file-too-large");
 
+	// FIXME this should use postMessage() all the same
+
         std::string s = boost::lexical_cast<std::string>(request.tooLarge());
         o << fileUpload_->fileTooLarge().createCall(s);
       }
@@ -445,8 +447,9 @@ DomElement *WFileUpload::createDomElement(WApplication *app)
 
     std::stringstream s;
 
-    doJavaScript("var f = function(event) {"
-		 """if (" + jsRef() + ".action.indexOf(event.origin) === 0) {"
+    doJavaScript("var a" + id() + "=" + jsRef() + ".action;"
+		 "var f = function(event) {"
+		 """if (a" + id() + ".indexOf(event.origin) === 0) {"
 		 ""  "var data = JSON.parse(event.data);"
 		 ""  "if (data.fu == '" + id() + "')"
 		 +      app->javaScriptClass()

diff --git a/src/Wt/WPopupWidget.C b/src/Wt/WPopupWidget.C
@@ -40,6 +40,8 @@ WPopupWidget::WPopupWidget(WWidget *impl, WObject *parent)
 
   jsHidden_.connect(this, &WWidget::hide);
   jsShown_.connect(this, &WWidget::show);
+
+  WApplication::instance()->internalPathChanged().connect(this, &WWidget::hide);
 }
 
 WPopupWidget::~WPopupWidget()