Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Fix #355 Fix #356
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Dec 12, 2013
1 parent 0ea5b3a commit 93515f2
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 52 deletions.
48 changes: 1 addition & 47 deletions core/src/plugins/access.ajxp_conf/manifest.xml
View file
Expand Up @@ -35,52 +35,6 @@
}
</style>
]]></template_part>
<!--
<template_part ajxpClass="AjxpPane" ajxpId="info_panel" ajxpOptions='{}'><![CDATA[
<style>
.action_bar a, .menu.desktop.toolbarmenu, div.editor_header a{
background-color: rgb(78, 154, 179) !important;
}
.dialogTitle {
background-color: rgb(78, 154, 179) !important;
border-bottom: 1px solid rgb(50, 102, 119) !important;
}
#switch_to_settings_button {
display: none !important;
}
.table_rows_container td{
vertical-align:top;
}
</style>
<script>
var splitter = $("vertical_splitter").ajxpPaneObject;
splitter.paneB._max = 1;
splitter.options.maxB = 1;
splitter.resizeGroup();
document.observe("ajaxplorer:user_logged", function(){
if(ajaxplorer.repositoryId == "ajxp_conf"){
splitter.paneB._max = 1;
splitter.options.maxB = 1;
}else{
splitter.paneB._max = 0;
splitter.options.maxB = 0;
if(splitter.foldedPane && splitter.foldedPane == splitter.paneB){
splitter.paneB.setStyle({width:'26px'});
}
}
splitter.resizeGroup();
});
document.observeOnce("ajaxplorer:context_changed", function(){
$A($("folder_pane").ajxpPaneObject.tree.childNodes).each(function(c){c.expand();})
//$("folder_pane").ajxpPaneObject.tree.expandAll();
});
</script>
]]></template_part>
<template_part ajxpClass="AjxpTabulator" theme="vision" ajxpId="topPane" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"130","iconClass":"icon-folder-open","element":"folder_pane"},{"id":"flagged","label":"147","iconClass":"icon-star","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'><![CDATA[
<div id="folder_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
<div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
]]></template_part>
-->
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}'><![CDATA[
<div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
<style>
Expand All @@ -94,7 +48,7 @@
<div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
<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; box-shadow: rgba(0, 0, 0, 0.247059) -1px 1px 6px;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
<div id="rightPane" style="background-color:#fffff; box-shadow: rgba(0, 0, 0, 0.247059) -1px 1px 6px;" 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="files_list_pane" ajxpClass="AjxpPane">
<div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div></div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/access.ajxp_user/manifest.xml
View file
Expand Up @@ -82,7 +82,7 @@
}
</style>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="vision"><![CDATA[
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true", "messageBoxReference":true}' theme="vision"><![CDATA[
<div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="settings_main_pane dashboard_main_pane flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "home","tabInfos" : [{"id":"home","label":"Home","iconClass":"icon-home", "element":"home_account_pane"},{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"parameters_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"files_list_pane"}]}'>
<div id="home_account_pane" ajxpClass="UserDashboardHome">
<div id="notifications_center">
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
View file
Expand Up @@ -56,7 +56,7 @@ Class.create("Ajaxplorer", {
*/
init:function(){
document.observe("ajaxplorer:registry_loaded", function(){
this.refreshExtensionsRegistry();
this.refreshExtensionsRegistry();
this.logXmlUser(this._registry);
if(this.user){
var repId = this.user.getActiveRepository();
Expand All @@ -67,10 +67,12 @@ Class.create("Ajaxplorer", {
if(this.guiLoaded) {
this.refreshTemplateParts();
this.refreshGuiComponentConfigs();
this.refreshExtensionsRegistry();
} else {
document.observe("ajaxplorer:gui_loaded", function(){
this.refreshTemplateParts();
this.refreshGuiComponentConfigs();
this.refreshExtensionsRegistry();
}.bind(this));
}
this.loadActiveRepository();
Expand Down
5 changes: 5 additions & 0 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
View file
Expand Up @@ -190,6 +190,10 @@ Class.create("FilesList", SelectableElements, {
if(!this._dataModel){
this._registerObserver(document, "ajaxplorer:trigger_repository_switch", repoSwitchObserver);
}
if(this.options.messageBoxReference && ajaxplorer){
ajaxplorer.registerAsMessageBoxReference(this.htmlElement);
}

},

_registerObserver:function(object, eventName, handler, objectEvent){
Expand Down Expand Up @@ -1759,6 +1763,7 @@ Class.create("FilesList", SelectableElements, {
// Defer Drag'n'drop assignation for performances
if(!ajxpNode.isRecycle()){
window.setTimeout(function(){
if(!this.htmlElement) return;
var newDrag = new AjxpDraggable(newRow, {
revert:true,
ghosting:true,
Expand Down
6 changes: 5 additions & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FormManager.js
View file
Expand Up @@ -327,6 +327,9 @@ Class.create("FormManager", {
values,
false,
true);
if(selector.getAttribute('data-disableShortcutsOnForm')){
this.disableShortcutsOnForm(target.FIELDS_CONTAINER);
}
}.bind(this));

if(selector.getValue()){
Expand Down Expand Up @@ -618,7 +621,8 @@ Class.create("FormManager", {
},

disableShortcutsOnForm: function(form){
form.select("input,textarea,select").invoke("observe", "focus", function(){
form.select("input,textarea,select").invoke("observe", "focus", function(event){
if(event.target.nodeName.toLowerCase() == 'select') event.target.writeAttribute('data-disableShortcutsOnForm', 'true');
ajaxplorer.disableAllKeyBindings();
});
form.select("input,textarea,select").invoke("observe", "blur", function(){
Expand Down
3 changes: 2 additions & 1 deletion core/src/plugins/uploader.html/manifest.xml
View file
Expand Up @@ -39,6 +39,7 @@
<!-- Stream Wrapper Access, and dependancy to uploader.flex forces the order -->
<activePlugin pluginName="access.AJXP_STREAM_PROVIDER"/>
<pluginClass pluginName="uploader.flex"/>
<pluginClass pluginName="gui.ajax"/>
</dependencies>
<processing>
<clientForm id="originalUploadForm"><![CDATA[
Expand Down Expand Up @@ -102,7 +103,7 @@
]]></dialogOnOpen>
<extensionOnInit><![CDATA[
if(typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined" && 'draggable' in new Element('span') && (window.FileReader || window.FormData) ){
var dropzone = $('content_pane');
var dropzone = $$('[ajxpClass="FilesList"]')[0];
dropzone.addClassName('droparea');
var selector = '#content_pane,div.webfx-tree-item,.ajxpNodeProvider';
var dragOverFunc = function(event) {
Expand Down

0 comments on commit 93515f2

Please sign in to comment.