From 91029e81407ce2c822328d109eefb8c35ef8d90b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 23 Jun 2009 19:25:50 +0000
Subject: [PATCH] Remove inline JS from the Date and DateTime forms by putting
 the user's firstDayOfWeek preference into the getWebuiProps.

---
 docs/changelog/7.x.x.txt    |  3 ++-
 lib/WebGUI/Form/Date.pm     | 21 +++++++++++----------
 lib/WebGUI/Form/DateTime.pm |  2 --
 lib/WebGUI/Session/Style.pm | 20 +++++++++++---------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index fdd173e80..278c9cd3f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,8 +2,9 @@
  - Updated auth to allow sending back of non-text/html mime types.
  - fixed #10564: edit branch progress bar goes kablooey
  - fixed #10565: Survey: add question doing double-create
- - fixed Photo resizing bugs with the Story asset.
+ - fixed: Photo resizing bugs with the Story asset.
  - Enabled better month and year navigation in the YUI date picker. (Tom Beharrell)
+ - fixed: Add the user's first day of week data to getWebguiProperties and get rid of some inline javascript in the Data and DateTime forms.
 
 7.7.11
  - Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi)
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index bf1bd22dd..ef5c8a517 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -234,18 +234,19 @@ sub toHtml {
         $self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
         $self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' });
         $self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' });
-        my $firstDow = $self->session->user->profileField("firstDayOfWeek");
-        $self->session->style->setRawHeadTags("<script type=\"text/javascript\">var webguiFirstDayOfWeek = $firstDow</script>");
+        #my $firstDow = $self->session->user->profileField("firstDayOfWeek");
+        #$self->session->style->setRawHeadTags("<script type=\"text/javascript\">var webguiFirstDayOfWeek = $firstDow</script>");
         $self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' });
 
-        return WebGUI::Form::Text->new($self->session,
-                name=>$self->get("name"),
-                value=>$value,
-                size=>$self->get("size"),
-                extras=>$self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this);"',
-                id=>$self->get('id'),
-                maxlength=>$self->get("maxlength")
-                )->toHtml;
+        my $field = WebGUI::Form::Text->new($self->session,
+                name      => $self->get("name"),
+                value     => $value,
+                size      => $self->get("size"),
+                extras    => $self->get("extras") . ' onfocus="YAHOO.WebGUI.Form.DatePicker.display(this);"',
+                id        => $self->get('id'),
+                maxlength => $self->get("maxlength"),
+        );
+        return $field->toHtml;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index 410d2313a..e5689782c 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -236,8 +236,6 @@ sub toHtml {
         $self->session->style->setScript($self->session->url->extras('yui/build/dom/dom-min.js'),{ type=>'text/javascript' });
         $self->session->style->setScript($self->session->url->extras('yui/build/event/event-min.js'),{ type=>'text/javascript' });
         $self->session->style->setScript($self->session->url->extras('yui/build/calendar/calendar-min.js'),{ type=>'text/javascript' });
-        my $firstDow = $self->session->user->profileField("firstDayOfWeek");
-        $self->session->style->setRawHeadTags("<script type=\"text/javascript\">window.webguiFirstDayOfWeek = $firstDow</script>");
         $self->session->style->setScript($self->session->url->extras('yui-webgui/build/datepicker/datepicker.js'),{ type=>'text/javascript' });
 
         return WebGUI::Form::Text->new($self->session,
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 9294334b7..43104fdc6 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -210,22 +210,23 @@ $session->asset's ancestors.
 =cut
 
 sub process {
-	my $self = shift;
+	my $self    = shift;
+    my $session = $self->session;
 	my %var;
 	$var{'body.content'} = shift;
 	my $templateId = shift;
 	if ($self->{_makePrintable} && $self->session->asset) {
-		$templateId = $self->{_printableStyleId} || $self->session->asset->get("printableStyleTemplateId");
-		my $currAsset = $self->session->asset;
-		my $rootAssetId = WebGUI::Asset->getRoot($self->session)->getId;
+		$templateId = $self->{_printableStyleId} || $session->asset->get("printableStyleTemplateId");
+		my $currAsset = $session->asset;
+		my $rootAssetId = WebGUI::Asset->getRoot($session)->getId;
 		TEMPLATE: until ($templateId) {
 			# some assets don't have this property.  But at least one ancestor should....
-			$currAsset = $currAsset->getParent;
+			$currAsset  = $currAsset->getParent;
 			$templateId = $currAsset->get("printableStyleTemplateId");
 			last TEMPLATE if $currAsset->getId eq $rootAssetId;
 		}
-	} elsif ($self->session->scratch->get("personalStyleId") ne "") {
-		$templateId = $self->session->scratch->get("personalStyleId");
+	} elsif ($session->scratch->get("personalStyleId") ne "") {
+		$templateId = $session->scratch->get("personalStyleId");
 	} elsif ($self->{_useEmptyStyle}) {
 		$templateId = 'PBtmpl0000000000000132';
 	}
@@ -237,8 +238,9 @@ $var{'head.tags'} = '
 <script type="text/javascript">
 function getWebguiProperty (propName) {
 var props = new Array();
-props["extrasURL"] = "'.$self->session->url->extras().'";
-props["pageURL"] = "'.$self->session->url->page(undef, undef, 1).'";
+props["extrasURL"] = "'     . $session->url->extras().'";
+props["pageURL"] = "'       . $session->url->page(undef, undef, 1).'";
+props["firstDayOfWeek"] = "'. $session->user->get('firstDayOfWeek').'";
 return props[propName];
 }
 </script>