mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
- fixing issue with xsls and virtualized jsps in IE. IE really wants script tags to have a separate close tag
- fixing issue with deleting repeat instances and tinymce - it has to be disposed of properly. should be good to go with IE for the preview now. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -36,8 +36,8 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js">&nbsp;</script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js">&nbsp;</script>
|
||||
<div id="container">
|
||||
<div id="masthead">
|
||||
<!-- Search -->
|
||||
|
@@ -30,8 +30,8 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js">&nbsp;</script>
|
||||
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js">&nbsp;</script>
|
||||
|
||||
<div id="container">
|
||||
<div id="masthead">
|
||||
|
@@ -185,6 +185,10 @@ dojo.declare("alfresco.xforms.Widget",
|
||||
{
|
||||
// this.domContainer.style.backgroundColor =
|
||||
// (!this.valid ? "yellow" : this.modified ? "lightgreen" : "white");
|
||||
},
|
||||
_destroy: function()
|
||||
{
|
||||
dojo.debug("destroying " + this.id);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -314,6 +318,12 @@ dojo.declare("alfresco.xforms.TextArea",
|
||||
this.domNode.innerHTML = this.getInitialValue() || "";
|
||||
tinyMCE.addMCEControl(this.domNode, this.id);
|
||||
this.widget = this.domNode;
|
||||
},
|
||||
_destroy: function()
|
||||
{
|
||||
this.inherited("_destroy", []);
|
||||
dojo.debug("removing mce control " + this.id);
|
||||
tinyMCE.removeMCEControl(this.id);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -646,19 +656,28 @@ dojo.declare("alfresco.xforms.Group",
|
||||
{
|
||||
var child = this.getChildAt(position);
|
||||
if (!child)
|
||||
throw new Error("unabled to find child at " + position);
|
||||
throw new Error("unable to find child at " + position);
|
||||
this.children.splice(position, 1);
|
||||
child.domContainer.group = this;
|
||||
var anim = dojo.lfx.html.fadeOut(child.domContainer, 500);
|
||||
anim.onEnd = function()
|
||||
{
|
||||
child.domContainer.style.display = "none";
|
||||
child._destroy();
|
||||
dojo.dom.removeChildren(child.domContainer);
|
||||
dojo.dom.removeNode(child.domContainer);
|
||||
child.domContainer.group._updateDisplay();
|
||||
};
|
||||
anim.play();
|
||||
},
|
||||
_destroy: function()
|
||||
{
|
||||
this.inherited("_destroy", []);
|
||||
for (var i = 0; i < this.children.length; i++)
|
||||
{
|
||||
this.children[i]._destroy();
|
||||
}
|
||||
},
|
||||
isIndented: function()
|
||||
{
|
||||
return false && this.parent != null;
|
||||
@@ -974,7 +993,7 @@ dojo.declare("alfresco.xforms.Submit",
|
||||
{
|
||||
dojo.debug("triggering submit from handler " + event.target.id);
|
||||
dojo.event.browser.stopEvent(event);
|
||||
tinyMCE.triggerSave();
|
||||
tinyMCE.triggerSave(true, false);
|
||||
_hide_errors();
|
||||
xform.submitWidget.currentButton = event.target;
|
||||
xform.submitWidget.widget.buttonClick();
|
||||
|
Reference in New Issue
Block a user