SF.net SVN: ledger-smb:[5527] branches/1.3

[..hidden..]

Revision: 5527
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5527&view=rev
Author:   einhverfr
Date:     2013-01-10 06:05:06 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Merging from trunk: Adjusting new Javascript to ignore return key strokes in text areas

Modified Paths:
--------------
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl
    branches/1.3/bin/oe.pl

Property Changed:
----------------
    branches/1.3/


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2013-01-10 06:01:51 UTC (rev 5526)
+++ branches/1.3/bin/ir.pl	2013-01-10 06:05:06 UTC (rev 5527)
@@ -417,7 +417,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13'){
+  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-01-10 06:01:51 UTC (rev 5526)
+++ branches/1.3/bin/is.pl	2013-01-10 06:05:06 UTC (rev 5527)
@@ -453,7 +453,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13'){
+  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2013-01-10 06:01:51 UTC (rev 5526)
+++ branches/1.3/bin/oe.pl	2013-01-10 06:05:06 UTC (rev 5527)
@@ -591,7 +591,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13'){
+  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.