Merge pull request #51 from joshkurz/master

updated CalendarCtrl to work with angular-ui v0.4.0

Author: ProLoser

index.html

@@ -17,6 +17,7 @@
 	<script src="http://fiddle.tinymce.com/tinymce/3.5.4.1/tiny_mce_jquery_src.js"></script>
 	<script src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
 	<script src="lib/calendar/fullcalendar.js"></script> 
+	<script src="http://arshaw.com/js/fullcalendar-1.5.3/fullcalendar/gcal.js"></script>
 	<script src="js/app.js"></script>
 
 	<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css">
@@ -347,7 +348,7 @@ <h3>Why?</h3>
 							<p>For easy integration with scope objects.</p>
 							<h4>Click to add an Event!</h4>
 						    </b>
-							<button style="margin-bottom: 3px;" class="btn btn-primary" ng-click="addChild()">Add Child</button>
+							 <button style="margin-bottom: 3px;" class="btn btn-primary" ng-click="addEvent()">Add Event</button>
 						    <ul>
 						        <li ng-repeat="e in events">
 						            <p class="alert alert-info">
@@ -358,30 +359,37 @@ <h4>Click to add an Event!</h4>
 						    </ul>
 
 						</div>
-
-						<div ui-calendar="{height: 450,editable: true}" class="span8 calendar" ng-model="events"></div>
+						<div ui-calendar="{height: 450,editable: true}" class="span8 calendar" ng-model="eventSources"></div>
 					</div>
 				</div>
 				<h3>How?</h3>
 				<pre class="prettyprint linenums">
 &lt;div ui-calendar="{height: 450,editable: true}" class="span8 calendar" ng-model="events"&gt;&lt;/div&gt; 
 
 function CalendarCtrl($scope) {
-	var date = new Date();
+    var date = new Date();
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
+    $scope.eventSource = {
+            url: "http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic",
+            className: 'gcal-event',           // an option!
+            currentTimezone: 'America/Chicago' // an option!
+        };
+
     $scope.events = [
 	  {title: 'All Day Event',start: new Date(y, m, 1)},
 	  {title: 'Long Event',start: new Date(y, m, d - 5),end: new Date(y, m, d - 2)},
 	  {id: 999,title: 'Repeating Event',start: new Date(y, m, d - 3, 16, 0),allDay: false},
 	  {id: 999,title: 'Repeating Event',start: new Date(y, m, d + 4, 16, 0),allDay: false},
 	  {title: 'Birthday Party',start: new Date(y, m, d + 1, 19, 0),end: new Date(y, m, d + 1, 22, 30),allDay: false},
 	  {title: 'Click for Google',start: new Date(y, m, 28),end: new Date(y, m, 29),url: 'http://google.com/'}
-    ]
+    ];
+
+    $scope.eventSources = [$scope.events, $scope.eventSource];
 
-    $scope.addChild = function() {
+    $scope.addEvent = function() {
       $scope.events.push({
         title: 'Open Sesame',
         start: new Date(y, m, 28),

js/app.js

@@ -192,17 +192,25 @@ function CalendarCtrl($scope) {
     var d = date.getDate();
     var m = date.getMonth();
     var y = date.getFullYear();
-    
+
+    $scope.eventSource = {
+            url: "http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic",
+            className: 'gcal-event',           // an option!
+            currentTimezone: 'America/Chicago' // an option!
+        };
+
     $scope.events = [
 	  {title: 'All Day Event',start: new Date(y, m, 1)},
 	  {title: 'Long Event',start: new Date(y, m, d - 5),end: new Date(y, m, d - 2)},
 	  {id: 999,title: 'Repeating Event',start: new Date(y, m, d - 3, 16, 0),allDay: false},
 	  {id: 999,title: 'Repeating Event',start: new Date(y, m, d + 4, 16, 0),allDay: false},
 	  {title: 'Birthday Party',start: new Date(y, m, d + 1, 19, 0),end: new Date(y, m, d + 1, 22, 30),allDay: false},
 	  {title: 'Click for Google',start: new Date(y, m, 28),end: new Date(y, m, 29),url: 'http://google.com/'}
-    ]
+    ];
+
+    $scope.eventSources = [$scope.events, $scope.eventSource];
 
-    $scope.addChild = function() {
+    $scope.addEvent = function() {
       $scope.events.push({
         title: 'Open Sesame',
         start: new Date(y, m, 28),