Auto switch to list tab on context change, thus do not trigger reload…

…DataNode() to avoid auto switch to list tab.
pydio · Dec 17, 2013 · dfd76aa · dfd76aa
1 parent 72b8bfe
commit dfd76aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
@@ -1240,7 +1240,9 @@ public function switchAction($action, $httpVars, $fileVars)
                     AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.53"]);
                 } else {
                     AJXP_XMLWriter::sendMessage($mess["ajxp_conf.54"], null);
-                    AJXP_XMLWriter::reloadDataNode("", (isSet($httpVars["newLabel"])?$repId:false));
+                    if(isSet($httpVars["newLabel"])) {
+                        AJXP_XMLWriter::reloadDataNode("", $repId);
+                    }
                     AJXP_XMLWriter::reloadRepositoryList();
                 }
                 AJXP_XMLWriter::close();
@@ -1530,7 +1532,6 @@ public function switchAction($action, $httpVars, $fileVars)
                 @unlink(AJXP_PLUGINS_MESSAGES_FILE);
                 AJXP_XMLWriter::header();
                 AJXP_XMLWriter::sendMessage($mess["ajxp_conf.97"], null);
-                AJXP_XMLWriter::reloadDataNode();
                 AJXP_XMLWriter::close();
 
 

diff --git a/core/src/plugins/access.ajxp_conf/manifest.xml b/core/src/plugins/access.ajxp_conf/manifest.xml
@@ -49,7 +49,7 @@
                         <div id="buttons_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
                     </div>
                     <div id="rightPane"  style="background-color:#fffff; border-left: 1px solid #5C5C5C;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "messageBoxReference":true}'>
-                        <div id="editor_tabs" ajxpClass="AjxpTabulator" class="flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":true, "saveState":false,"events":{}, "defaultTabId": "info","tabInfos" : [{"id":"info","label":"","iconClass":"icon-list-alt", "element":"files_list_pane"}]}'>
+                        <div id="editor_tabs" ajxpClass="AjxpTabulator" class="flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchTabulator(this.tabulatorData.first().id);"}, "defaultTabId": "info","tabInfos" : [{"id":"info","label":"","iconClass":"icon-list-alt", "element":"files_list_pane"}]}'>
                             <div id="files_list_pane" ajxpClass="AjxpPane">
                                 <div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div></div>
                                 <div id="actions" class="buttons_bar_container">