diff options
author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dojo/dnd/common.js | |
parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/dnd/common.js')
-rw-r--r-- | lib/dojo/dnd/common.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/dnd/common.js b/lib/dojo/dnd/common.js index 4ac2dca56..5c065e9a8 100644 --- a/lib/dojo/dnd/common.js +++ b/lib/dojo/dnd/common.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ //>>built -define("dojo/dnd/common",["../_base/connect","../_base/kernel","../_base/lang","../dom"],function(_1,_2,_3,_4){var _5=_3.getObject("dojo.dnd",true);_5.getCopyKeyState=_1.isCopyKey;_5._uniqueId=0;_5.getUniqueId=function(){var id;do{id=_2._scopeName+"Unique"+(++_5._uniqueId);}while(_4.byId(id));return id;};_5._empty={};_5.isFormElement=function(e){var t=e.target;if(t.nodeType==3){t=t.parentNode;}return " button textarea input select option ".indexOf(" "+t.tagName.toLowerCase()+" ")>=0;};return _5;});
\ No newline at end of file +define("dojo/dnd/common",["../sniff","../_base/kernel","../_base/lang","../dom"],function(_1,_2,_3,_4){var _5=_3.getObject("dojo.dnd",true);_5.getCopyKeyState=function(_6){return _6[_1("mac")?"metaKey":"ctrlKey"];};_5._uniqueId=0;_5.getUniqueId=function(){var id;do{id=_2._scopeName+"Unique"+(++_5._uniqueId);}while(_4.byId(id));return id;};_5._empty={};_5.isFormElement=function(e){var t=e.target;if(t.nodeType==3){t=t.parentNode;}return " a button textarea input select option ".indexOf(" "+t.tagName.toLowerCase()+" ")>=0;};return _5;});
\ No newline at end of file |