[richfaces-svn-commits] JBoss Rich Faces SVN: r1354 - in trunk/richfaces: common/src/main/resources/org/richfaces/renderkit/html/scripts/json and 1 other directories.
Author: nbelaevski
Date: 2007-06-27 14:56:51 -0400 (Wed, 27 Jun 2007)
New Revision: 1354
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
Log:
Script refactoring broke dragIndicator - fixing...
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
===================================================================
---
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-06-27
18:42:02 UTC (rev 1353)
+++
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-06-27
18:56:51 UTC (rev 1354)
@@ -156,7 +156,7 @@
writer.startElement("script", component);
writer.write("var evaluator = ");
writeScriptBody(context, component, true, null);
- writer.write("new Insertion.Top($('" + component.getClientId(context) +
"'), evaluator.invoke('getOuterHTML', window).join(''));");
+ writer.write("new Insertion.Top($('" + component.getClientId(context) +
"'), evaluator.invoke('getContent', window).join(''));");
writer.endElement("script");
}
}
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
===================================================================
---
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-27
18:42:02 UTC (rev 1353)
+++
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-27
18:56:51 UTC (rev 1354)
@@ -55,6 +55,9 @@
var html = "<"+this.tag;
var inner = this.getInnerHTML(context);
for(var i in this.attrs) {
+ if (!this.attrs.hasOwnProperty(i)) {
+ continue ;
+ }
var attrValue = this.attrs[i];
Modified:
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
===================================================================
---
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-06-27
18:42:02 UTC (rev 1353)
+++
trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-06-27
18:56:51 UTC (rev 1354)
@@ -32,7 +32,7 @@
parts = this.indicatorTemplates['multi'];
}
- new Insertion.Top(this, parts.invoke('getOuterHTML', p).join(''));
+ new Insertion.Top(this, parts.invoke('getContent', p).join(''));
},
show: function() {