diff --git a/changelog.html b/changelog.html index e509c7a8b4..95b33f635a 100644 --- a/changelog.html +++ b/changelog.html @@ -57,7 +57,7 @@ Upcoming changes
/configure.
(issue 14538)
diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js
index 10941e69b2..047e25078e 100644
--- a/core/src/main/resources/lib/form/repeatable/repeatable.js
+++ b/core/src/main/resources/lib/form/repeatable/repeatable.js
@@ -18,9 +18,6 @@ var repeatableSupport = {
// do the initialization
init : function(container,master,insertionPoint) {
this.container = $(container);
- if (this.container.tag != null) {
- return;
- }
this.container.tag = this;
master = $(master);
this.blockHTML = master.innerHTML;
diff --git a/war/src/main/webapp/scripts/behavior.js b/war/src/main/webapp/scripts/behavior.js
index f8dcfdc2b6..130b452a19 100644
--- a/war/src/main/webapp/scripts/behavior.js
+++ b/war/src/main/webapp/scripts/behavior.js
@@ -65,12 +65,22 @@ var Behaviour = {
* this semantics is preserved.
*/
applySubtree : function(startNode,includeSelf) {
+ var behaviorsBySelector = {};
Behaviour.list._each(function(sheet) {
for (var selector in sheet){
function apply(n) {
- var list = findElementsBySelector(n,selector,includeSelf);
- if (list.length>0) // just to simplify setting of a breakpoint.
- list._each(sheet[selector]);
+ var behavior = sheet[selector];
+ var behaviors = behaviorsBySelector[selector];
+ if (behaviors == null) {
+ behaviors = [];
+ behaviorsBySelector[selector] = behaviors;
+ }
+ if (behaviors.indexOf(behavior.toString()) == -1) {
+ behaviors.push(behavior.toString());
+ var list = findElementsBySelector(n,selector,includeSelf);
+ if (list.length>0) // just to simplify setting of a breakpoint.
+ list._each(sheet[selector]);
+ }
}
if (startNode instanceof Array) {