You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/11/07 11:36:13 UTC

svn commit: r1406529 - /myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js

Author: werpu
Date: Wed Nov  7 10:36:12 2012
New Revision: 1406529

URL: http://svn.apache.org/viewvc?rev=1406529&view=rev
Log:
MYFACES-3637 fix for the eval handling

Modified:
    myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js

Modified: myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js?rev=1406529&r1=1406528&r2=1406529&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js (original)
+++ myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js Wed Nov  7 10:36:12 2012
@@ -122,7 +122,12 @@ _MF_SINGLTN(_PFX_UTIL + "_Dom", Object, 
             finalScripts = [],
             execScrpt = function(item) {
                 var tagName = item.tagName;
-                if (tagName && _Lang.equalsIgnoreCase(tagName, "script")) {
+                var itemType = item.type || "";
+                if(tagName && _Lang.equalsIgnoreCase(tagName, "script") &&
+                        (itemType === "" || _Lang.equalsIgnoreCase(itemType,"text/javascript") ||
+                         _Lang.equalsIgnoreCase(itemType,"javascript") ||
+                         _Lang.equalsIgnoreCase(itemType,"text/ecmascript") ||
+                         _Lang.equalsIgnoreCase(itemType,"ecmascript"))) {
                     var src = item.getAttribute('src');
                     if ('undefined' != typeof src
                             && null != src