support attaching file to HTML5 input with multiple attribute

jaimeiniesta · Jul 20, 2011 · 0c8e347 · 0c8e347
1 parent a449008
commit 0c8e347
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/WebPage.cpp b/src/WebPage.cpp
@@ -137,7 +137,18 @@ QString WebPage::chooseFile(QWebFrame *parentFrame, const QString &suggestedFile
   Q_UNUSED(parentFrame);
   Q_UNUSED(suggestedFile);
 
-  QString javascript = QString("Capybara.lastAttachedFile");
-  return currentFrame()->evaluateJavaScript(javascript).toString();
+  return getLastAttachedFileName();
 }
 
+bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output) {
+  if (extension == ChooseMultipleFilesExtension) {
+    QStringList names = QStringList() << getLastAttachedFileName();
+    static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
+    return true;
+  }
+  return false;
+}
+
+QString WebPage::getLastAttachedFileName() {
+  return currentFrame()->evaluateJavaScript(QString("Capybara.lastAttachedFile")).toString();
+}
diff --git a/src/WebPage.h b/src/WebPage.h
@@ -11,6 +11,7 @@ class WebPage : public QWebPage {
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
     bool render(const QString &fileName);
+    virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -31,5 +32,6 @@ class WebPage : public QWebPage {
     QString m_capybaraJavascript;
     QString m_userAgent;
     bool m_loading;
+    QString getLastAttachedFileName();
 };