extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing appname causing share link to reload everything

Browse Source
This commit is contained in:
nathangray 2020-03-06 13:04:52 -07:00
parent 28143ab160
commit 66f197d0b0
2 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
filemanager/js/app.js
View File

@ -302,7 +302,7 @@ var filemanagerAPP = /** @class */ (function (_super) {
*/ */
filemanagerAPP.prototype._upload_callback = function (_data) { filemanagerAPP.prototype._upload_callback = function (_data) {
if (_data.msg || _data.uploaded) if (_data.msg || _data.uploaded)
window.egw_refresh(_data.msg, this.appname); window.egw_refresh(_data.msg, filemanagerAPP.appname);
var that = this; var that = this;
for (var file in _data.uploaded) { for (var file in _data.uploaded) {
if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed) { if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed) {
@ -513,7 +513,7 @@ var filemanagerAPP = /** @class */ (function (_super) {
* @param _data * @param _data
*/ */
filemanagerAPP.prototype._do_action_callback = function (_data) { filemanagerAPP.prototype._do_action_callback = function (_data) {
window.egw_refresh(_data.msg, this.appname); window.egw_refresh(_data.msg, filemanagerAPP.appname);
}; };
/** /**
* Force download of a file by appending '?download' to it's download url * Force download of a file by appending '?download' to it's download url
@ -724,8 +724,8 @@ var filemanagerAPP = /** @class */ (function (_super) {
(dir && dir.data && dir.data.class && dir.data.class.indexOf('noEdit') === -1 || !dir) (dir && dir.data && dir.data.class && dir.data.class.indexOf('noEdit') === -1 || !dir)
}); });
// Last 10 folders // Last 10 folders
var previous_dsts = jQuery.extend([], egw.preference('drop_history', this.appname)); var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
var action_index = 0; var action_index = 0;
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {
var path = i < previous_dsts.length ? previous_dsts[i] : ''; var path = i < previous_dsts.length ? previous_dsts[i] : '';
actions.push({ actions.push({
@ -806,10 +806,10 @@ var filemanagerAPP = /** @class */ (function (_super) {
} }
} }
// Remember the target for next time // Remember the target for next time
var previous_dsts = jQuery.extend([], egw.preference('drop_history', this.appname)); var previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
previous_dsts.unshift(dst); previous_dsts.unshift(dst);
previous_dsts = Array.from(new Set(previous_dsts)).slice(0, 9); previous_dsts = Array.from(new Set(previous_dsts)).slice(0, 9);
egw.set_preference(this.appname, 'drop_history', previous_dsts); egw.set_preference(filemanagerAPP.appname, 'drop_history', previous_dsts);
// Actual action id will be something like file_drop_{move|copy|link}[_other_id], // Actual action id will be something like file_drop_{move|copy|link}[_other_id],
// but we need to send move, copy or link // but we need to send move, copy or link
var action_id = _action.id.replace("file_drop_", '').split('_', 1)[0]; var action_id = _action.id.replace("file_drop_", '').split('_', 1)[0];
@ -976,7 +976,7 @@ var filemanagerAPP = /** @class */ (function (_super) {
*/ */
filemanagerAPP.prototype._share_link_callback = function (_data) { filemanagerAPP.prototype._share_link_callback = function (_data) {
if (_data.msg || _data.share_link) if (_data.msg || _data.share_link)
window.egw_refresh(_data.msg, this.appname); window.egw_refresh(_data.msg, filemanagerAPP.appname);
console.log("_data", _data); console.log("_data", _data);
var app = this; var app = this;
var copy_link_to_clipboard = function (evt) { var copy_link_to_clipboard = function (evt) {
@ -1091,16 +1091,17 @@ var filemanagerAPP = /** @class */ (function (_super) {
* @param {object} _selected either widget or selected row * @param {object} _selected either widget or selected row
* *
* @return {boolean} returns true * @return {boolean} returns true
*/ */
filemanagerAPP.prototype.create_new = function (_action, _selected) { filemanagerAPP.prototype.create_new = function (_action, _selected) {
var fe = egw.link_get_registry('filemanager-editor'); var fe = egw.link_get_registry('filemanager-editor');
if (fe && fe["edit"]) { if (fe && fe["edit"]) {
egw.open_link(egw.link('/index.php', { egw.open_link(egw.link('/index.php', {
menuaction: fe["edit"].menuaction menuaction: fe["edit"].menuaction
}), '', fe["popup_edit"]); }), '', fe["popup_edit"]);
} }
return true; return true;
}; };
filemanagerAPP.appname = 'filemanager';
return filemanagerAPP; return filemanagerAPP;
}(egw_app_1.EgwApp)); }(egw_app_1.EgwApp));
exports.filemanagerAPP = filemanagerAPP; exports.filemanagerAPP = filemanagerAPP;

75
filemanager/js/app.ts
View File

@ -19,15 +19,15 @@ import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
*/ */
export class filemanagerAPP extends EgwApp export class filemanagerAPP extends EgwApp
{ {
static readonly appname: 'filemanager'; static readonly appname = 'filemanager';
/** /**
* path widget, by template * path widget, by template
*/ */
path_widget : {} = {}; path_widget: {} = {};
/** /**
* Are files cut into clipboard - need to be deleted at source on paste * Are files cut into clipboard - need to be deleted at source on paste
*/ */
clipboard_is_cut : boolean = false; clipboard_is_cut: boolean = false;
/** /**
* Regexp to convert id to a path, use this.id2path(_id) * Regexp to convert id to a path, use this.id2path(_id)
@ -356,17 +356,23 @@ export class filemanagerAPP extends EgwApp
*/ */
_upload_callback(_data) _upload_callback(_data)
{ {
if (_data.msg || _data.uploaded) window.egw_refresh(_data.msg, this.appname); if(_data.msg || _data.uploaded) window.egw_refresh(_data.msg, filemanagerAPP.appname);
let that = this; let that = this;
for(let file in _data.uploaded) for (let file in _data.uploaded)
{ {
if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed) if(_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
{ {
let buttons = [ let buttons = [
{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check'}, {
{text: this.egw.lang("Rename"), id:"rename", image: 'edit'}, text: this.egw.lang("Yes"),
{text: this.egw.lang("Cancel"), id:"cancel"} id: "overwrite",
class: "ui-priority-primary",
"default": true,
image: 'check'
},
{text: this.egw.lang("Rename"), id: "rename", image: 'edit'},
{text: this.egw.lang("Cancel"), id: "cancel"}
]; ];
if (_data.uploaded[file].confirm === "is_dir") if (_data.uploaded[file].confirm === "is_dir")
buttons.shift(); buttons.shift();
@ -615,7 +621,7 @@ export class filemanagerAPP extends EgwApp
*/ */
_do_action_callback(_data) _do_action_callback(_data)
{ {
window.egw_refresh(_data.msg, this.appname); window.egw_refresh(_data.msg, filemanagerAPP.appname);
} }
/** /**
@ -869,25 +875,25 @@ export class filemanagerAPP extends EgwApp
let target_dir = this.id2path(_target.id); let target_dir = this.id2path(_target.id);
dir = egw.dataGetUIDdata(_target.id); dir = egw.dataGetUIDdata(_target.id);
actions.push({ actions.push({
id: _action.id+'_target', id: _action.id + '_target',
caption: target_dir, caption: target_dir,
path: target_dir, path: target_dir,
enabled: _target && _target.iface && jQuery(_target.iface.getDOMNode()).hasClass('isDir') && enabled: _target && _target.iface && jQuery(_target.iface.getDOMNode()).hasClass('isDir') &&
(dir && dir.data && dir.data.class && dir.data.class.indexOf('noEdit') === -1 || !dir) (dir && dir.data && dir.data.class && dir.data.class.indexOf('noEdit') === -1 || !dir)
}); });
// Last 10 folders // Last 10 folders
let previous_dsts = jQuery.extend([], <any><unknown>egw.preference('drop_history',this.appname)); let previous_dsts = jQuery.extend([], <any><unknown>egw.preference('drop_history', filemanagerAPP.appname));
let action_index = 0; let action_index = 0;
for(let i = 0; i < 10; i++) for (let i = 0; i < 10; i++)
{ {
let path = i < previous_dsts.length ? previous_dsts[i] : ''; let path = i < previous_dsts.length ? previous_dsts[i] : '';
actions.push({ actions.push({
id: _action.id+'_target_'+action_index++, id: _action.id + '_target_' + action_index++,
caption: path, caption: path,
path: path, path: path,
group: 2, group: 2,
enabled: path && !(current_dir && path === current_dir || target_dir && path === target_dir) enabled: path && !(current_dir && path === current_dir || target_dir && path === target_dir)
}); });
} }
@ -969,7 +975,7 @@ export class filemanagerAPP extends EgwApp
if(_target.id) if(_target.id)
{ {
let data = egw.dataGetUIDdata(_target.id); let data = egw.dataGetUIDdata(_target.id);
if (!data || data.data.mime != 'httpd/unix-directory') if(!data || data.data.mime != 'httpd/unix-directory')
{ {
dst = this.dirname(dst); dst = this.dirname(dst);
} }
@ -977,14 +983,14 @@ export class filemanagerAPP extends EgwApp
} }
// Remember the target for next time // Remember the target for next time
let previous_dsts = jQuery.extend([], egw.preference('drop_history',this.appname)); let previous_dsts = jQuery.extend([], egw.preference('drop_history', filemanagerAPP.appname));
previous_dsts.unshift(dst); previous_dsts.unshift(dst);
previous_dsts = Array.from(new Set(previous_dsts)).slice(0,9); previous_dsts = Array.from(new Set(previous_dsts)).slice(0, 9);
egw.set_preference(this.appname, 'drop_history', previous_dsts); egw.set_preference(filemanagerAPP.appname, 'drop_history', previous_dsts);
// Actual action id will be something like file_drop_{move|copy|link}[_other_id], // Actual action id will be something like file_drop_{move|copy|link}[_other_id],
// but we need to send move, copy or link // but we need to send move, copy or link
let action_id = _action.id.replace("file_drop_",'').split('_',1)[0]; let action_id = _action.id.replace("file_drop_", '').split('_', 1)[0];
this._do_action(action_id, src, false, dst || nm_dst); this._do_action(action_id, src, false, dst || nm_dst);
} }
@ -1181,17 +1187,20 @@ export class filemanagerAPP extends EgwApp
* Share-link callback * Share-link callback
* @param {object} _data * @param {object} _data
*/ */
_share_link_callback(_data) { _share_link_callback(_data)
if (_data.msg || _data.share_link) window.egw_refresh(_data.msg, this.appname); {
if(_data.msg || _data.share_link) window.egw_refresh(_data.msg, filemanagerAPP.appname);
console.log("_data", _data); console.log("_data", _data);
let app = this; let app = this;
let copy_link_to_clipboard = function(evt){ let copy_link_to_clipboard = function (evt)
{
let $target = jQuery(evt.target); let $target = jQuery(evt.target);
$target.select(); $target.select();
try { try
{
let successful = document.execCommand('copy'); let successful = document.execCommand('copy');
if (successful) if(successful)
{ {
egw.message(app.egw.lang('Share link copied into clipboard')); egw.message(app.egw.lang('Share link copied into clipboard'));
return true; return true;