egw_action: egw_action.js egw_action_dragdrop.js

hnategh-2 2016-03-29 12:49:05 UTC #1

Author: hnategh
New Revision: 55555

URL: http://svn.stylite.de/viewvc/egroupware?rev=55555&view=rev
Log:
Fix user-select not working in FF

Modified:
trunk/phpgwapi/js/egw_action/egw_action.js
trunk/phpgwapi/js/egw_action/egw_action_dragdrop.js

Modified: trunk/phpgwapi/js/egw_action/egw_action.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/egw_action/egw_action.js?rev=55555&r1=55554&r2=55555&view=diff

— trunk/phpgwapi/js/egw_action/egw_action.js (original)
+++ trunk/phpgwapi/js/egw_action/egw_action.js Tue Mar 29 14:49:05 2016
@@ -2161,11 +2161,11 @@

/**

Check if user tries to get dragOut action

- keys for dragOut:
- -Mac: Command + Shift
- -Others: Alt + Shift

- @param {event} _event
- @return {boolean} return true if Alt+Shift keys and left mouse click arre pressed, otherwise false
  */
  @@ -2176,17 +2176,17 @@

/**

Check if user tries to get selection action

- Keys for selection:
- -Mac: Command key
- -Others: Ctrl key

- @param {type} _event

- @returns {Boolean} return true if left mouse click and Ctrl key are pressed, otherwise false

- @returns {Boolean} return true if left mouse click and Ctrl/Alt key are pressed, otherwise false
  */
  egwActionObject.prototype.isSelection = function (_event)
  {

return !(_event.shiftKey) && _event.which == 1 && (_event.metaKey || _event.ctrlKey);

return !(_event.shiftKey) && _event.which == 1 && (_event.metaKey || _event.ctrlKey || _event.altKey);
};

/** egwActionObjectInterface Interface **/

Modified: trunk/phpgwapi/js/egw_action/egw_action_dragdrop.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/egw_action/egw_action_dragdrop.js?rev=55555&r1=55554&r2=55555&view=diff

— trunk/phpgwapi/js/egw_action/egw_action_dragdrop.js (original)
+++ trunk/phpgwapi/js/egw_action/egw_action_dragdrop.js Tue Mar 29 14:49:05 2016
@@ -342,7 +342,7 @@
return ai.defaultDDHelper(ai.selected);//$j(document.createElement(“div”)).addClass(‘et2_egw_action_ddHelper’);
},
“start”: function(e) {

  				//Stop dragging if user tries to do scrolling by mouse down and drag
  				//Seems this issue is only happening in FF
  				var $target = $j(e.originalEvent.target);

@@ -350,7 +350,7 @@
{
return false;
}

  				return ai.helper != null;
  			},
  			revert: function(valid)

@@ -368,9 +368,14 @@
{
var key = [“Mac68K”,“MacPPC”,“MacIntel”].indexOf(window.navigator.platform) < 0 ?
egw.lang(“Ctrl”) : egw.lang(“Command â”);

  						// We can not use Ctrl key for FF because FF has specific function

  						// for element selection bound to ctrl key and it would confilicts

  						// with our selection functionallity. Therefore, we use Alt key when

  						// it comes to FF regardless of OS.

  						if (window.navigator.userAgent.match(/firefox/i)) key = egw.lang("Alt");
  						egw.message(egw.lang('Hold [%1] key to select text eg. to copy it', key), 'info');
  					}

  					// Invalid target
  					return true;
  				}

@@ -638,10 +643,10 @@
// set of properties.
var popup = getPopupImplementation();
var pos = popup._getPageXY(event.originalEvent);

  					// Don't add paste actions, this is a drop
  					popup.auto_paste = false;

  					window.setTimeout(function() {
  						popup.doExecuteImplementation(pos, selected, links,
  							_context);

@@ -651,7 +656,7 @@
}
// Set cursor back to auto. Seems FF can’t handle cursor reversion
$j(‘body’).css({cursor:‘auto’});

  				_aoi.triggerEvent(EGW_AI_DRAG_OUT,{event: event,ui:ui});
  			},
  			"over": function(event, ui) {

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

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