R48524 - in /branches/14.1/filemanager: inc/class.filemanager_ui.inc.php js/app.js

Old eGW-svn
1

Author: ralfbecker
New Revision: 48524

URL: http://svn.stylite.de/viewvc/egroupware?rev=48524&view=rev
Log:

  • Filemanager: fixed not working file drop in with Firefox
    by avoiding global event variable

Modified:
branches/14.1/filemanager/inc/class.filemanager_ui.inc.php
branches/14.1/filemanager/js/app.js

Modified: branches/14.1/filemanager/inc/class.filemanager_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/filemanager/inc/class.filemanager_ui.inc.php?rev=48524&r1=48523&r2=48524&view=diff

— branches/14.1/filemanager/inc/class.filemanager_ui.inc.php (original)
+++ branches/14.1/filemanager/inc/class.filemanager_ui.inc.php Tue Sep 9 11:06:14 2014
@@ -459,7 +459,6 @@
‘3’ => ‘Show hidden files’,
‘0’ => ‘Files from subdirectories’,
);

  •   $tpl->setElementAttribute('nm', 'onfiledrop', 'app.filemanager.filedrop');

  $tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
    }

Modified: branches/14.1/filemanager/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/filemanager/js/app.js?rev=48524&r1=48523&r2=48524&view=diff

— branches/14.1/filemanager/js/app.js (original)
+++ branches/14.1/filemanager/js/app.js Tue Sep 9 11:06:14 2014
@@ -68,6 +68,13 @@
this._super.apply(this, arguments);

	this.path_widget = this.et2.getWidgetById('path');

  •   if(this.et2.getWidgetById('nm'))

  •   {

  •   	// Legacy JS only supports 2 arguments (event and widget), so set

  •   	// to the actual function here

  •   	this.et2.getWidgetById('nm').set_onfiledrop(jQuery.proxy(this.filedrop, this));

  •   }

  // get clipboard from browser localstore and update button tooltips
  if (typeof window.localStorage != 'undefined' && typeof window.localStorage[this.clipboard_localstore_key] != 'undefined')

@@ -580,10 +587,9 @@
* This is a callback from nextmatch to prevent the default link action, and just upload instead.
*
* @param {string} row_uid UID of the row the files were dropped on

    • @param {et2_nextmatch} widget widget that got the drop
    • @param {array} files
  • */
  • filedrop: function(row_uid, widget ,files)
    • @param {Files[]} files
  • */
  • filedrop: function(row_uid, files)
    {
    var self = this;
    var data = egw.dataGetUIDdata(row_uid);

Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs