Repository: struts Updated Branches: refs/heads/support-2-3 c349dfa5a -> 9e8627ca6
WW-4770 Fixes problem with dojo.version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9e8627ca Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9e8627ca Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9e8627ca Branch: refs/heads/support-2-3 Commit: 9e8627ca669ec566bbedd638fc6010e8ae364160 Parents: c349dfa Author: Stefaan Dutry <stefaan.du...@gmail.com> Authored: Fri Mar 24 21:34:31 2017 +0100 Committer: Stefaan Dutry <stefaan.du...@gmail.com> Committed: Fri Mar 24 21:34:31 2017 +0100 ---------------------------------------------------------------------- .../dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js | 2 +- .../org/apache/struts2/static/dojo/dojo.js.uncompressed.js | 2 +- .../org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/9e8627ca/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js ---------------------------------------------------------------------- diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js index 862371a..f71b675 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js @@ -33,7 +33,7 @@ dojo.global=function(){ return dj_currentContext; }; dojo.locale=djConfig.locale; -dojo.version={major:0,minor:4,patch:3,flag:"",revision:Number("$Rev$".match(/[0-9]+/)[0]),toString:function(){ +dojo.version={major:0,minor:4,patch:3,flag:"",revision:Number("$Rev: 670371 $".match(/[0-9]+/)[0]),toString:function(){ with(dojo.version){ return major+"."+minor+"."+patch+flag+" ("+revision+")"; } http://git-wip-us.apache.org/repos/asf/struts/blob/9e8627ca/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js ---------------------------------------------------------------------- diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js index eb451b2..c994cbd 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js @@ -100,7 +100,7 @@ dojo.locale = djConfig.locale; dojo.version = { // summary: version number of this instance of dojo. major: 0, minor: 4, patch: 3, flag: "", - revision: Number("$Rev$".match(/[0-9]+/)[0]), + revision: Number("$Rev: 670371 $".match(/[0-9]+/)[0]), toString: function(){ with(dojo.version){ return major + "." + minor + "." + patch + flag + " (" + revision + ")"; // String http://git-wip-us.apache.org/repos/asf/struts/blob/9e8627ca/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js ---------------------------------------------------------------------- diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js index 36f2497..89985a5 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js @@ -90,7 +90,7 @@ dojo.locale = djConfig.locale; dojo.version = { // summary: version number of this instance of dojo. major: 0, minor: 4, patch: 3, flag: "", - revision: Number("$Rev$".match(/[0-9]+/)[0]), + revision: Number("$Rev: 670371 $".match(/[0-9]+/)[0]), toString: function(){ with(dojo.version){ return major + "." + minor + "." + patch + flag + " (" + revision + ")"; // String
