[pLog-svn] r5733 - in plog/trunk: js/cookie js/location js/ui js/ui/pages templates/admin templates/admin/chooser
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Thu Jul 26 16:37:28 EDT 2007
Author: oscar
Date: 2007-07-26 16:37:28 -0400 (Thu, 26 Jul 2007)
New Revision: 5733
Added:
plog/trunk/templates/admin/jsconfig.template
Modified:
plog/trunk/js/cookie/cookie.js
plog/trunk/js/location/location.js
plog/trunk/js/ui/common.js
plog/trunk/js/ui/pages/newpost.js
plog/trunk/templates/admin/chooser/header.template
plog/trunk/templates/admin/header.template
Log:
Removed most of the global variables I could find in our javascript code, please use Lifetype.Config.get/setValue() from now on.
Modified: plog/trunk/js/cookie/cookie.js
===================================================================
--- plog/trunk/js/cookie/cookie.js 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/js/cookie/cookie.js 2007-07-26 20:37:28 UTC (rev 5733)
@@ -31,4 +31,5 @@
// Make a unique cookie name for each blog.
// If you change this, please remember change the cookie name in adminaddpostaction.class.php too.
var re = new RegExp("[^a-zA-Z0-9]", "g" );
-var LTCookieBaseName = "LT" + plogBaseUrl.replace( re, "" ) + plogBlogId;
\ No newline at end of file
+//var LTCookieBaseName = "LT" + plogBaseUrl.replace( re, "" ) + plogBlogId;
+var LTCookieBaseName = "LT" + Lifetype.Config.getValue( 'base_url' ).replace( re, "" ) + Lifetype.Config.getValue( 'blog_id' );
\ No newline at end of file
Modified: plog/trunk/js/location/location.js
===================================================================
--- plog/trunk/js/location/location.js 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/js/location/location.js 2007-07-26 20:37:28 UTC (rev 5733)
@@ -327,6 +327,7 @@
{
// decode the JSon message and get the fields that we need
+ window.alert(o.responseText);
var msg = Lifetype.JSon.decode( o.responseText );
var success = msg.success;
var message = msg.message;
Modified: plog/trunk/js/ui/common.js
===================================================================
--- plog/trunk/js/ui/common.js 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/js/ui/common.js 2007-07-26 20:37:28 UTC (rev 5733)
@@ -9,7 +9,8 @@
*/
Lifetype.Media.getFlashPlayerHTML = function( url, height, width )
{
- var playerUrl = plogBaseUrl + "/flash/mp3player/mp3player.swf";
+ //var playerUrl = plogBaseUrl + "/flash/mp3player/mp3player.swf";
+ var playerUrl = Lifetype.Config.getValue( 'base_url' ) + "/flash/mp3player/mp3player.swf";
var htmlCode = "<object data=\"" + playerUrl + "\" type=\"application/x-shockwave-flash\" width=\"" + width +"\" height=\"" + height + "\" class=\"ltPlayer\">"+
"<param name=\"quality\" value=\"best\" />"+
Modified: plog/trunk/js/ui/pages/newpost.js
===================================================================
--- plog/trunk/js/ui/pages/newpost.js 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/js/ui/pages/newpost.js 2007-07-26 20:37:28 UTC (rev 5733)
@@ -13,7 +13,7 @@
var params = 'op=addArticleCategory' + '&categoryName=' + encodeURIComponent(categoryName) + "&output=json";
// build the full URL
- var url = plogAdminBaseUrl + "?" + params;
+ var url = Lifetype.Config.getValue( 'admin_base_url' ) + "?" + params;
var transaction = YAHOO.util.Connect.asyncRequest( 'GET', url, { success:Lifetype.UI.Pages.NewPost.addArticleCategoryOption, failure:Lifetype.UI.Pages.NewPost.addArticleCategoryOption } );
@@ -101,7 +101,7 @@
var formData = Lifetype.UI.Pages.NewPost.getPostEditFormElements( "newPost" );
var params = 'op=saveDraftArticleAjax&'+formData;
- var url = plogAdminBaseUrl + "?" + params;
+ var url = Lifetype.Config.getValue( 'admin_base_url' ) + "?" + params;
var transaction = YAHOO.util.Connect.asyncRequest( 'GET', url, { success:Lifetype.UI.Pages.NewPost.saveDraftArticleResponse });
}
@@ -145,26 +145,14 @@
}
}
else if( itemName == "postText" && htmlAreaEnabled ) {
- if ( blogLocale == "UTF-8" ) {
- formData = formData + itemName + "=" + encodeURIComponent(tinyMCE.getContent('postText')) + "&";
- } else {
- formData = formData + itemName + "=" + escape(tinyMCE.getContent('postText')) + "&";
- }
+ formData = formData + itemName + "=" + encodeURIComponent(tinyMCE.getContent('postText')) + "&";
}
else if( itemName == "postExtendedText" && htmlAreaEnabled ) {
- if ( blogLocale == "UTF-8" ) {
- formData = formData + itemName + "=" + encodeURIComponent(tinyMCE.getContent('postExtendedText')) + "&";
- } else {
- formData = formData + itemName + "=" + escape(tinyMCE.getContent('postExtendedText')) + "&";
- }
+ formData = formData + itemName + "=" + encodeURIComponent(tinyMCE.getContent('postExtendedText')) + "&";
}
else {
// for all other elements, normal handling
- if ( blogLocale == "UTF-8" ) {
- formData = formData + itemName + "=" + encodeURIComponent(itemValue) + "&";
- } else {
- formData = formData + itemName + "=" + escape(itemValue) + "&";
- }
+ formData = formData + itemName + "=" + encodeURIComponent(itemValue) + "&";
}
}
}
Modified: plog/trunk/templates/admin/chooser/header.template
===================================================================
--- plog/trunk/templates/admin/chooser/header.template 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/templates/admin/chooser/header.template 2007-07-26 20:37:28 UTC (rev 5733)
@@ -18,9 +18,7 @@
<script type="text/javascript" src="js/ui/tableeffects.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript" src="js/ui/forms.js"></script>
- <script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
- var indexPage = '{$config->getValue("script_name")}';
- </script>
+ {include file="$admintemplatepath/jsconfig.template"}
+ {include file="$admintemplatepath/jslocale.template"}
</head>
<body>
Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template 2007-07-26 20:22:45 UTC (rev 5732)
+++ plog/trunk/templates/admin/header.template 2007-07-26 20:37:28 UTC (rev 5733)
@@ -17,15 +17,6 @@
<!--[if IE ]>
<link rel="stylesheet" href="styles/admin-ie.css" type="text/css" media="screen" />
<![endif] -->
-<script type="text/javascript">
- var blogLocale = '{$locale->getCharset()|upper}';
- // base url where we can find the admin.php script
- var plogBaseUrl = "{$url->getBaseUrl(false)}";
- var scriptName = "{$config->getValue("script_name")}";
- var plogAdminBaseUrl = "{$url->getBaseUrl(false)}/admin.php";
- var plogBlogId = "{$blog->getId()}";
-</script>
-{js src="js/cookie/cookie.js"}
<!-- Yahoo UI Library -->
{js src="js/yui/yahoo/yahoo-min.js"}
{js src="js/yui/dom/dom-min.js"}
@@ -45,6 +36,7 @@
{js src="js/ui/contentoverlay.js"}
{js src="js/ui/dom.js"}
{js src="js/ui/menu.js"}
+{js src="js/cookie/cookie.js"}
{if $location_data_enabled}
<!-- Location libraries -->
{js src="http://maps.google.com/maps?file=api&v=2&key=$google_maps_api_key"}
@@ -55,6 +47,7 @@
<link rel="stylesheet" href="js/JSCookMenu/ThemeOffice/theme.css" type="text/css" />
{js src="js/JSCookMenu/ThemeOffice/theme.js"}
{/if}
+{include file="$admintemplatepath/jsconfig.template"}
{include file="$admintemplatepath/jslocale.template"}
</head>
<body>
Added: plog/trunk/templates/admin/jsconfig.template
===================================================================
--- plog/trunk/templates/admin/jsconfig.template (rev 0)
+++ plog/trunk/templates/admin/jsconfig.template 2007-07-26 20:37:28 UTC (rev 5733)
@@ -0,0 +1,12 @@
+{**
+ Please place here all the global configuration settings that are
+ accessed by Javascript code. Use the Lifetype.Config class
+ to store them, do *not* use global variables!
+**}
+<script type="text/javascript">
+ // base url where we can find the admin.php script
+ Lifetype.Config.setValue( 'base_url', "{$url->getBaseUrl(false)}" );
+ Lifetype.Config.setValue( 'script_name', "{$config->getValue("script_name")}" );
+ Lifetype.Config.setValue( 'admin_base_url', "{$url->getBaseUrl(false)}/admin.php" );
+ Lifetype.Config.setValue( 'blog_id', "{$blog->getId()}" );
+</script>
\ No newline at end of file
More information about the pLog-svn
mailing list