rework OPML import process

[tt-rss.git] / prefs.js

diff --git a/prefs.js b/prefs.js
index 4851611a384e8f9ca724690ad437d3d8e17d2f76..0eb570f5f3d660476582e9618f4c6dda5801faf5 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -782,6 +782,33 @@ function piggie(enable) {
        }
 }
 
+function opmlImportComplete(iframe) {
+       try {
+               if (!iframe.contentDocument.body.innerHTML) return false;
+
+               notify('');
+
+               if (dijit.byId('opmlImportDlg'))
+                       dijit.byId('opmlImportDlg').destroyRecursive();
+
+               var content = iframe.contentDocument.body.innerHTML;
+
+               dialog = new dijit.Dialog({
+                       id: "opmlImportDlg",
+                       title: __("OPML Import"),
+                       style: "width: 600px",
+                       onCancel: function() {
+                               updateFeedList();       
+                       },
+                       content: content});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("opmlImportComplete", e);
+       }
+}
+
 function opmlImport() {
        
        var opml_file = $("opml_file");
@@ -1512,22 +1539,6 @@ function activatePrefProfile() {
        return false;
 }
 
-function opmlImportDone() {
-       closeInfoBox();
-       updateFeedList();
-}
-
-function opmlImportHandler(iframe) {
-       try {
-               var tmp = new Object();
-               tmp.responseText = iframe.document.body.innerHTML;
-               notify('');
-               infobox_callback2(tmp);
-       } catch (e) {
-               exception_error("opml_import_handler", e);
-       }
-}
-
 function clearFeedAccessKeys() {
 
        var ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));