inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixing issue with xsls and virtualized jsps in IE. IE really wants script tags to have a separate close tag

Browse Source 
- 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:
Ariel Backenroth
2006-10-08 03:14:53 +00:00
parent bb3ce60c38
commit 591f91b26d
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-resources/websites/alfresco/ROOT/media/releases/index.jsp
View File

@@ -36,8 +36,8 @@
</style> </style>
</head> </head>
<body> <body>
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script> <script language="JavaScript" type="text/javascript" src="/assets/js/controls.js">&amp;nbsp;</script>
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script> <script language="JavaScript" type="text/javascript" src="/assets/js/search.js">&amp;nbsp;</script>
<div id="container"> <div id="container">
<div id="masthead"> <div id="masthead">
<!-- Search --> <!-- Search -->

4
source/test-resources/xforms/demos/press-release/press-release.xsl
View File

@@ -30,8 +30,8 @@
</style> </style>
</head> </head>
<body> <body>
<script language="JavaScript" type="text/javascript" src="/assets/js/controls.js"></script> <script language="JavaScript" type="text/javascript" src="/assets/js/controls.js">&amp;nbsp;</script>
<script language="JavaScript" type="text/javascript" src="/assets/js/search.js" ></script> <script language="JavaScript" type="text/javascript" src="/assets/js/search.js">&amp;nbsp;</script>
<div id="container"> <div id="container">
<div id="masthead"> <div id="masthead">

23
source/web/scripts/ajax/xforms.js
View File

@@ -185,6 +185,10 @@ dojo.declare("alfresco.xforms.Widget",
{ {
// this.domContainer.style.backgroundColor = // this.domContainer.style.backgroundColor =
// (!this.valid ? "yellow" : this.modified ? "lightgreen" : "white"); // (!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() || ""; this.domNode.innerHTML = this.getInitialValue() || "";
tinyMCE.addMCEControl(this.domNode, this.id); tinyMCE.addMCEControl(this.domNode, this.id);
this.widget = this.domNode; 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); var child = this.getChildAt(position);
if (!child) 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); this.children.splice(position, 1);
child.domContainer.group = this; child.domContainer.group = this;
var anim = dojo.lfx.html.fadeOut(child.domContainer, 500); var anim = dojo.lfx.html.fadeOut(child.domContainer, 500);
anim.onEnd = function() anim.onEnd = function()
{ {
child.domContainer.style.display = "none"; child.domContainer.style.display = "none";
child._destroy();
dojo.dom.removeChildren(child.domContainer); dojo.dom.removeChildren(child.domContainer);
dojo.dom.removeNode(child.domContainer); dojo.dom.removeNode(child.domContainer);
child.domContainer.group._updateDisplay(); child.domContainer.group._updateDisplay();
}; };
anim.play(); anim.play();
}, },
_destroy: function()
{
this.inherited("_destroy", []);
for (var i = 0; i < this.children.length; i++)
{
this.children[i]._destroy();
}
},
isIndented: function() isIndented: function()
{ {
return false && this.parent != null; return false && this.parent != null;
@@ -974,7 +993,7 @@ dojo.declare("alfresco.xforms.Submit",
{ {
dojo.debug("triggering submit from handler " + event.target.id); dojo.debug("triggering submit from handler " + event.target.id);
dojo.event.browser.stopEvent(event); dojo.event.browser.stopEvent(event);
tinyMCE.triggerSave(); tinyMCE.triggerSave(true, false);
_hide_errors(); _hide_errors();
xform.submitWidget.currentButton = event.target; xform.submitWidget.currentButton = event.target;
xform.submitWidget.widget.buttonClick(); xform.submitWidget.widget.buttonClick();