mikuli.cz

commit bdb4e137d2b967be429c7993e7afca01f35cfe35
parent 01f89e5818a4c23143444dae93ad2d5787bb72e7
Author: markseu <mark2011@mayberg.se>
Date:   Wed,  9 Jun 2021 19:09:34 +0200

Updated edit extension, real close button for M173K1

Diffstat:
M
system/extensions/edit.js
 | 
8
+++++++-
M
system/extensions/edit.php
 | 
4
+++-
M
system/extensions/update-current.ini
 | 
4
++--

3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/system/extensions/edit.js b/system/extensions/edit.js
@@ -575,12 +575,12 @@ yellow.edit = {
                 case "edit":        this.showPane(paneId, action, status, true); break;
                 case "delete":      this.showPane(paneId, action, status, true); break;
                 case "menu":        this.showPane(paneId, action, status); break;
-                case "close":       this.hidePane(this.paneId); break;
                 case "toolbar":     this.processToolbar(status, arguments); break;
                 case "settings":    this.processSettings(arguments); break;
                 case "submit":      this.processSubmit(arguments); break;
                 case "restore":     this.processSubmit("action:"+action); break;
                 case "help":        this.processHelp(); break;
+                case "close":       this.processClose(); break;
             }
         }
     },
@@ -690,6 +690,12 @@ yellow.edit = {
         window.open(this.getText("YellowHelpUrl"), "_self");
     },
     
+    // Process close
+    processClose: function() {
+        this.hidePane(this.paneId);
+        if (yellow.page.action=="login") window.open(yellow.page.pageRead, "_self");
+    },
+    
     // Create popup
     createPopup: function(popupId) {
         if (yellow.system.debug) console.log("yellow.edit.createPopup id:"+popupId);
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -2,7 +2,7 @@
 // Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 
 class YellowEdit {
-    const VERSION = "0.8.47";
+    const VERSION = "0.8.48";
     public $yellow;         // access to API
     public $response;       // web response
     public $merge;          // text merge
@@ -1205,6 +1205,8 @@ class YellowEditResponse {
             $data["base"] = $this->yellow->page->base;
             $data["location"] = $this->yellow->page->location;
         }
+        $data["pageRead"] = $this->yellow->page->get("pageRead");
+        $data["pageEdit"] = $this->yellow->page->get("pageEdit");
         if ($this->action!="none") $data = array_merge($data, $this->getRequestData());
         $data["action"] = $this->action;
         $data["status"] = $this->status;
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -37,11 +37,11 @@ system/layouts/navigation.html: navigation.html, create, update, careful
 system/layouts/pagination.html: default.html, create, update, careful
 
 Extension: Edit
-Version: 0.8.47
+Version: 0.8.48
 Description: Edit your website in a web browser.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/edit.zip
-Published: 2021-06-02 10:24:02
+Published: 2021-06-09 18:23:40
 Developer: Datenstrom
 Tag: feature
 system/extensions/edit.php: edit.php, create, update