You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/07 18:51:05 UTC
svn commit: r1608514 [1/5] - in /roller/trunk:
app/src/main/webapp/WEB-INF/jsps/editor/
app/src/main/webapp/roller-ui/yui3/yui/ docs/
Author: gmazza
Date: Mon Jul 7 16:51:04 2014
New Revision: 1608514
URL: http://svn.apache.org/r1608514
Log:
Switched from YUI2 to YUI3 for adding/removing classes from DOM elements.
Added:
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui/
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui/yui-debug.js
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui/yui-min.js
roller/trunk/app/src/main/webapp/roller-ui/yui3/yui/yui.js
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/docs/roller-template-guide.odt
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1608514&r1=1608513&r2=1608514&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Mon Jul 7 16:51:04 2014
@@ -17,10 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/yahoo-dom-event/yahoo-dom-event.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.js' />"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui3/yui/yui-min.js' />"></script>
<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
@@ -106,9 +103,13 @@
<script type="text/javascript">
function highlight(el, flag) {
if (flag) {
- YAHOO.util.Dom.addClass(el, "highlight");
+ YUI().use('node', function (Y) {
+ Y.one(el).addClass("highlight");
+ });
} else {
- YAHOO.util.Dom.removeClass(el, "highlight");
+ YUI().use('node', function (Y) {
+ Y.one(el).removeClass("highlight");
+ });
}
}
</script>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1608514&r1=1608513&r2=1608514&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Mon Jul 7 16:51:04 2014
@@ -27,6 +27,7 @@
<script type="text/javascript" src="<s:url value='/roller-ui/yui/button/button-min.js' />"></script>
<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />'></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui3/yui/yui-min.js' />"></script>
<style>
@@ -342,13 +343,17 @@
<%-- Media file folder contents --%>
<script type="text/javascript">
- function highlight(el, flag) {
- if (flag) {
- YAHOO.util.Dom.addClass(el, "highlight");
- } else {
- YAHOO.util.Dom.removeClass(el, "highlight");
+ function highlight(el, flag) {
+ if (flag) {
+ YUI().use('node', function (Y) {
+ Y.one(el).addClass("highlight");
+ });
+ } else {
+ YUI().use('node', function (Y) {
+ Y.one(el).removeClass("highlight");
+ });
+ }
}
- }
</script>
<div width="720px" height="500px">