]> code.delx.au - comingnext/commitdiff
javascript: General whitespace and style cleanups
authorPaul Moore <pcmoore@umich.edu>
Tue, 8 Sep 2009 15:01:24 +0000 (11:01 -0400)
committerPaul Moore <pcmoore@umich.edu>
Tue, 8 Sep 2009 15:01:24 +0000 (11:01 -0400)
No code changes, all changes involve whitespace and coding style.

comingNext/index.html

index 6cc53067de7e950ab73dfa24d6036092679cb4c6..6379fd99b5445edea7d5cf46f11ce009b8a5f447 100644 (file)
@@ -2,7 +2,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml">\r
 <head>\r
+\r
 <title>Coming Next</title>\r
+\r
 <style type="text/css">\r
 /* -----------------------------------------------------------------------\r
 here you can customize background color, font color, font size etc...\r
@@ -17,7 +19,9 @@ here you can customize background color, font color, font size etc...
 .description { }                       /* Defines the appearance of all event descriptions */\r
 .icon { width:15px; height:15px; }     /* Defines size and appearance of icons */\r
 </style>\r
+\r
 <script>\r
+\r
 //---------------------------------------------------------------\r
 // The following section contains settings you may want to tweak\r
 //---------------------------------------------------------------\r
@@ -37,7 +41,7 @@ var updateDataInterval = 5;   // how many minutes to wait before updating the disp
 var calendarApp = 0x10005901;  // UID of the calendar app to run when clicking the widget. 0x10005901 = buildin calendar, 0x20004ec1 = Epocware Handy Calendar\r
 var eventsPerWidget = 4;       // number of events to show per widget. Default is 4\r
 var showNothingText = true;    // if set to "true", show a text if no events are in the list\r
-var nothingText = 'No further events within '+monthRange+' months';            // text to show when no events are in the list\r
+var nothingText = 'No further events within ' + monthRange + ' months';                // text to show when no events are in the list\r
 \r
 //-------------------------------------------------------\r
 // Nothing of interest from here on...\r
@@ -53,19 +57,22 @@ window.onload = init;
 window.onresize = updateScreen;\r
 window.onshow = updateScreen;\r
 \r
-function error(message){\r
+function error(message)\r
+{\r
        console.info('Error: ' + message);\r
        document.getElementById("calendarList").innerHTML = 'Error: ' + message;\r
 }\r
 \r
-function collectLocales(){\r
-       if (months_translated.length > 0){\r
-               return;\r
-       }\r
+function collectLocales()\r
+{\r
        var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
        var month = 0;\r
-       for(month = 0; month < 12; month++){\r
+\r
+       if (months_translated.length > 0)\r
+               return;\r
+       for (month = 0; month < 12; month++) {\r
                var startDate = new Date(tmpyear, month, 15);\r
+\r
                var item = new Object();\r
                item.Type = "DayEvent";\r
                item.StartTime = startDate;\r
@@ -77,15 +84,13 @@ function collectLocales(){
 \r
                try {\r
                        var result = calendarService.IDataSource.Add(criteria);\r
-                       if (result.ErrorCode){\r
+                       if (result.ErrorCode)\r
                                error(result.ErrorMessage);\r
-                       }\r
-               }\r
-               catch (e) {\r
+               } catch (e) {\r
                        error("collectLocales: " + e + ', line ' + e.line);\r
                }\r
        }\r
-       try{\r
+       try {\r
                var startTime = new Date(tmpyear,0,1);\r
                var endTime = new Date(tmpyear,11,31);\r
                var listFiltering = {\r
@@ -98,75 +103,80 @@ function collectLocales(){
                        }\r
                }\r
                var result = calendarService.IDataSource.GetList(listFiltering);\r
-               if (result.ErrorCode){\r
+               if (result.ErrorCode) {\r
                        error(result.ErrorMessage);\r
                        return;\r
                }\r
                var list = result.ReturnValue;\r
-       }catch(e){ \r
+       } catch(e) {\r
                error(e + ', line ' + e.line);\r
                return;\r
        }\r
        var ids = new Array();\r
-       try{\r
+       try {\r
                var entry;\r
                var counter = 0;\r
                var dateArr = [];\r
-               while( list && (entry = list.getNext()) != undefined ){\r
+\r
+               while (list && (entry = list.getNext()) != undefined) {\r
                        dateArr = entry.StartTime.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');\r
                        var day = dateArr[1];\r
                        var month = dateArr[2];\r
                        var year = dateArr[3];\r
+\r
                        // make sure month is set properly\r
-                       if (isNaN(parseInt(day))){\r
+                       if (isNaN(parseInt(day))) {\r
                                var tmp = day;\r
                                day = month;\r
                                month = tmp;\r
-                       }\r
-                       else if (isNaN(parseInt(year))){\r
+                       } else if (isNaN(parseInt(year))) {\r
                                var tmp = year;\r
                                year = month;\r
                                month = tmp;\r
                        }\r
+\r
                        console.info(entry.StartTime + ' -> ' + month + ' ' + counter);\r
                        ids[counter] = entry.id;\r
                        months_translated[month] = counter + 1;\r
                        counter++;\r
                }\r
-       }catch(e){\r
+       } catch(e) {\r
                error(e + ', line ' + e.line);\r
                return;\r
        }\r
        console.info(ids);\r
-       try{\r
+       try {\r
                var criteria = new Object();\r
                criteria.Type = "CalendarEntry";\r
                criteria.Data = {\r
                        IdList: ids\r
                }\r
+\r
                var result = calendarService.IDataSource.Delete(criteria);\r
                if (result.ErrorCode)\r
                        error(result.ErrorMessage);\r
-       }catch(e){\r
+       } catch(e) {\r
                error('deleting temp calendar entries:' + e + ', line ' + e.line);\r
                return;\r
        }\r
 }\r
 \r
-function requestNotification(){\r
+function requestNotification()\r
+{\r
        var criteria = new Object();\r
        criteria.Type = "CalendarEntry";\r
+\r
        try {\r
                var result = calendarService.IDataSource.RequestNotification(criteria, callback);\r
                if (result.ErrorCode)\r
                        error('loading Calendar items list');\r
-       }\r
-       catch (e) {\r
+       } catch (e) {\r
                error("requestNotification: " + e + ', line ' + e.line);\r
        }\r
 }\r
 \r
-function callback(transId, eventCode, result){\r
+function callback(transId, eventCode, result)\r
+{\r
        updateData();\r
 }\r
 \r
@@ -181,33 +191,30 @@ function parseDate(dateString)
        Wednesday,  2009 August, 28 8.00.00 pm\r
        Wednesday,  2009 August, 28 08:00:00 PM\r
        */\r
+\r
        if (dateString == "" || dateString == null)\r
                return null;\r
-       \r
        var dateArr = dateString.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');\r
-       \r
        if (dateArr.length != 5 && dateArr.length != 6)\r
                return null;\r
-       \r
+\r
        // parse date\r
        var weekDay = dateArr[0];\r
        var day = dateArr[1];\r
        var month = dateArr[2];\r
        var year = dateArr[3];\r
        // make sure month is set properly\r
-       if (isNaN(parseInt(day))){\r
+       if (isNaN(parseInt(day))) {\r
                var tmp = day;\r
                day = month;\r
                month = tmp;\r
-       }\r
-       else if (isNaN(parseInt(year))){\r
+       } else if (isNaN(parseInt(year))) {\r
                var tmp = year;\r
                year = month;\r
                month = tmp;\r
        }\r
        // make sure day and year are set properly\r
-       if (Number(day) > Number(year))\r
-       {\r
+       if (Number(day) > Number(year)) {\r
                var tmp = year;\r
                year = day;\r
                day = tmp;\r
@@ -225,9 +232,9 @@ function parseDate(dateString)
                hours += 12;\r
        if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12)\r
                hours = 0;\r
-       \r
+\r
        console.info('year=' + year + ' month=' + month + ' day=' + day + ' hours=' + hours + ' minutes=' + minutes+ ' seconds=' + seconds);\r
-       \r
+\r
        return new Date(year, month - 1, day, hours, minutes, seconds);\r
 }\r
 \r
@@ -241,35 +248,34 @@ function formatDate(date, format)
 \r
        if (showTodayAsText && now.getDate() == date.getDate() && now.getMonth() == date.getMonth())\r
                return '<span class="today">' + todayText + '</span>';\r
-       \r
+\r
        var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');\r
-       \r
-       if (dateArr.length != 5 && dateArr.length != 6){\r
+       if (dateArr.length != 5 && dateArr.length != 6) {\r
                // we don't know how to format this\r
                if (dateFormat == 'auto' || dateFormat == 'DDMM')\r
                        return day + dateSeparator + month;\r
-               else \r
+               else\r
                        return month + dateSeparator + day;\r
        }\r
-       \r
+\r
        var dayFirst = true;\r
        if (dateFormat == 'MMDD')\r
                dayFirst = false;\r
        else if (dateFormat == 'DDMM')\r
                dayFirst = true;\r
-       else { // dateFormat == 'auto', try to detect system setting\r
+       else {\r
+               // dateFormat == 'auto', try to detect system setting\r
                // parse date\r
                var day_ = dateArr[1];\r
                var month_ = dateArr[2];\r
                var year_ = dateArr[3];\r
                // make sure month is set properly\r
-               if (isNaN(parseInt(day_))){\r
+               if (isNaN(parseInt(day_))) {\r
                        var tmp = day_;\r
                        day_ = month_;\r
                        month_ = tmp;\r
                        dayFirst = false;\r
-               }\r
-               else if (isNaN(parseInt(year_))){\r
+               } else if (isNaN(parseInt(year_))) {\r
                        var tmp = year_;\r
                        year_ = month_;\r
                        month_ = tmp;\r
@@ -279,7 +285,7 @@ function formatDate(date, format)
                if (Number(day_) > Number(year_))\r
                        dayFirst = false;\r
        }\r
-       \r
+\r
        if (dayFirst)\r
                return day + dateSeparator + month;\r
        else\r
@@ -298,25 +304,27 @@ function formatTime(date)
        return time;\r
 }\r
 \r
-function updateData(){\r
-       try{\r
+function updateData()\r
+{\r
+       try {\r
                // meetings have time\r
                // note: anniveraries have a start time of 12:00am. So since we want to include them, we have to query the whole day and check if events have passed later\r
                now = new Date();\r
                var meetingListFiltering = {\r
-                       Type:'CalendarEntry', \r
+                       Type:'CalendarEntry',\r
                        Filter:{\r
-                               StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)), \r
+                               StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),\r
                                EndRange: (new Date(now.getFullYear(), now.getMonth() + monthRange, now.getDate(), 0, 0, 0))\r
                        }\r
                }\r
                var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);\r
                var meetingList = meetingResult.ReturnValue;\r
+\r
                // todos don't, they start on 00:00 hrs., but should be visible anyway\r
                // this will generate a list of passed todos. We have to check if they have been marked as "done" yet\r
-               if (includeTodos){\r
+               if (includeTodos) {\r
                        var todayTodoListFiltering = {\r
-                               Type:'CalendarEntry', \r
+                               Type:'CalendarEntry',\r
                                Filter:{\r
                                        Type: 'ToDo',\r
                                        StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),\r
@@ -329,12 +337,12 @@ function updateData(){
                } else {\r
                        var entryLists = [meetingList];\r
                }\r
-       }catch(e){ \r
+       } catch(e) {\r
                error('loading Calendar items list:' + e + ', line ' + e.line);\r
                return;\r
        }\r
-       \r
-       try{\r
+\r
+       try {\r
                var entry;\r
                var counter = 0;\r
                var entryDate = '';\r
@@ -342,11 +350,12 @@ function updateData(){
                var entriesHtml = '<table>';\r
                var eventIds = [];\r
                var max = ((panelNum == 0) ? eventsPerWidget : 2 * eventsPerWidget);\r
+\r
                // the first outer loop iteration is for passed ToDos, the second loop is for all upcomming events (may also include ToDos)\r
-               for(var i=0; counter < max && i < entryLists.length; i++){\r
-                       while( counter < max && (entry = entryLists[i].getNext()) != undefined ){\r
+               for (var i=0; counter < max && i < entryLists.length; i++) {\r
+                       while (counter < max && (entry = entryLists[i].getNext()) != undefined) {\r
                                counter++;\r
-                               \r
+\r
                                // output event info for debugging\r
                                console.info(\r
                                        'event: Id=' + entry.id + \r
@@ -359,16 +368,16 @@ function updateData(){
                                        ',InstanceStartTime=' + entry.InstanceStartTime +\r
                                        ',InstanceEndTime=' + entry.InstanceEndTime\r
                                );\r
-                               \r
+\r
                                // we don't want ToDos when includeTodos == false or when they are completed\r
-                               if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)){\r
+                               if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)) {\r
                                        console.info('skipping ' + entry.id );\r
                                        counter--;\r
                                        continue;\r
                                }\r
 \r
                                // make sure that we don't include an event twice (useful for ToDos that might come up twice)\r
-                               if (eventIds[entry.id] == 1){\r
+                               if (eventIds[entry.id] == 1) {\r
                                        console.info('skipped (already included) ' + entry.id);\r
                                        counter--;\r
                                        continue;\r
@@ -377,53 +386,52 @@ function updateData(){
 \r
                                // summary can be undefined!\r
                                var Summary = ((entry.Summary == null) ? '' : entry.Summary);\r
-                               if (entry.Type == 'Meeting' && entry.Location != '' && showLocation){\r
+                               if (entry.Type == 'Meeting' && entry.Location != '' && showLocation)\r
                                        Summary += ', ' + entry.Location;\r
-                               }\r
                                \r
                                // fix by yves: determine start and end dates/times\r
                                entryStartTime = ((entry.InstanceStartTime == null) ? entry.StartTime : entry.InstanceStartTime);\r
                                entryEndTime = ((entry.InstanceEndTime == null) ? entry.EndTime : entry.InstanceEndTime);\r
-                               \r
+\r
                                // there can be ToDos that have no date at all!\r
                                if (entry.Type == 'ToDo' && entry.EndTime == null)\r
                                        entryDate = ""; // this will cause parseDate(entryDate) to return null;\r
                                else\r
                                        entryDate = ((entry.Type == 'ToDo') ? entryEndTime : entryStartTime); // ToDo's use their EndTime, the rest use StartTime\r
-                               \r
+\r
                                // Convert date/time string to Date object\r
                                var date = parseDate(entryDate);\r
                                console.info('date: ' + date);\r
                                var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));\r
                                console.info('endDate: ' + endDate);\r
-                               \r
+\r
                                // check if meeting event has already passed\r
-                               if (entry.Type == 'Meeting'){\r
+                               if (entry.Type == 'Meeting') {\r
                                        var compareTime = ((endDate == null) ? date.getTime() : endDate.getTime());\r
-                                       if (now.getTime() > compareTime){\r
+                                       if (now.getTime() > compareTime) {\r
                                                console.info('skipping Meeting (already passed) ' + entry.id);\r
                                                counter--;\r
                                                eventIds[entry.id] = 0;\r
                                                continue;\r
                                        }\r
                                }\r
-                               \r
+\r
                                // check if anniversary passed (not sure why they are in the list, the query was only for today - nokia?)\r
-                               if (entry.Type == 'Anniversary'){\r
+                               if (entry.Type == 'Anniversary') {\r
                                        var tmp = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0,0,0);\r
-                                       if ( date.getTime() < tmp.getTime() ){\r
+                                       if (date.getTime() < tmp.getTime()) {\r
                                                console.info('skipping Anniversary (already passed) ' + entry.id);\r
                                                counter--;\r
                                                eventIds[entry.id] = 0;\r
                                                continue;\r
                                        }\r
                                }\r
-                               \r
+\r
                                // fix DayEvents end time. End times are off by 1 Second. It's possible that the event has already passed\r
-                               if (entry.Type == 'DayEvent' && endDate != null){\r
+                               if (entry.Type == 'DayEvent' && endDate != null) {\r
                                        endDate.setMinutes(endDate.getMinutes() - 1);\r
                                        console.info('fixing DayEvent endDate: ' + endDate);\r
-                                       if (now.getTime() > endDate.getTime()){\r
+                                       if (now.getTime() > endDate.getTime()) {\r
                                                console.info('event already passed ' + entry.id);\r
                                                counter--;\r
                                                eventIds[entry.id] = 0;\r
@@ -432,86 +440,86 @@ function updateData(){
                                }\r
 \r
                                // check if the event is currently taking place\r
-                               if (entryStartTime != null && entryEndTime != null && date != null && endDate != null)\r
-                               {\r
+                               if (entryStartTime != null && entryEndTime != null && date != null && endDate != null) {\r
                                        // check if we are between start and endtime\r
                                        if ((date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime())) {\r
                                                date = now; // change appointment date/time to now\r
                                                console.info('event is currently taking place: ' + date);\r
                                        }\r
                                }\r
-                               \r
+\r
                                // skip events for the first panel in case this is the second one\r
-                               if (panelNum == 1 && counter < eventsPerWidget + 1){\r
+                               if (panelNum == 1 && counter < eventsPerWidget + 1) {\r
                                        console.info('skipping (already in first widget) ' + entry.id);\r
                                        continue;\r
                                }\r
-                               \r
+\r
                                // generate html output\r
                                entriesHtml += '<tr><td><img class="icon" src="' + entry.Type + '.png" /></td>';\r
-                               if(date == null){ // some languages have very strange locale date formats, can't parse all those. Also some todos don't have dates at all.\r
+                               if(date == null) {\r
+                                       // some languages have very strange locale date formats, can't parse all those. Also some todos don't have dates at all.\r
                                        entriesHtml += '<td colspan="4"><span class="date">' + entryDate + '</span> ';\r
-                               }else{\r
+                               } else {\r
                                        var weekDay = date.toLocaleDateString().substr(0,weekDayLength);\r
                                        var time = formatTime(date);\r
                                        var dateStr = formatDate(date, entryDate);\r
-                                       if( entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder' ){\r
+                                       if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
                                                // decide if we want to leave off the weekday\r
                                                if (dateStr.search(/Today/) != -1)\r
-                                                       entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';\r
+                                                       entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
                                                else\r
-                                                       entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';\r
-                                       }else if( entry.Type == 'Meeting' ){\r
+                                                       entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
+                                       } else if (entry.Type == 'Meeting') {\r
                                                if (showCombinedDateTime) {\r
                                                        if (now.getDate() == date.getDate() && now.getMonth() == date.getMonth())\r
-                                                               entriesHtml += '<td colspan="4"><span class="today">'+ time +'</span> ';\r
+                                                               entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';\r
                                                        else {\r
                                                                // decide if we want to leave off the weekday\r
                                                                if (dateStr.search(/Today/) != -1)\r
-                                                                       entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';\r
+                                                                       entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
                                                                else\r
-                                                                       entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';\r
+                                                                       entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
                                                        }\r
                                                } else {\r
                                                        // decide if we want to leave off the weekday\r
                                                        if (dateStr.search(/Today/) != -1)\r
-                                                               entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> <span class="time">'+ time +'</span> ';\r
+                                                               entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
                                                        else\r
-                                                               entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td width="1px"><span class="time">'+ time +'</span></td><td>';\r
+                                                               entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td width="1px"><span class="time">' + time + '</span></td><td>';\r
                                                }\r
                                        }\r
                                }\r
-                               entriesHtml += '<span class="description">' + Summary +'</span></td></tr>';\r
+                               entriesHtml += '<span class="description">' + Summary + '</span></td></tr>';\r
                        }\r
                }\r
                entriesHtml += '</table>';\r
                if (showNothingText && entriesHtml == '<table></table>')\r
                        entriesHtml = '<div style="width:295px; height:75px; text-align:center; line-height:75px; overflow:visible;">' + nothingText + '</div>';\r
-               if( cacheEntriesHtml != entriesHtml ){\r
+               if (cacheEntriesHtml != entriesHtml) {\r
                        document.getElementById('calendarList').innerHTML = entriesHtml;\r
                        cacheEntriesHtml = entriesHtml;\r
                }\r
-       }catch(e){\r
+       } catch(e) {\r
                error('displaying list:' + e + ', line ' + e.line);\r
                return;\r
        }\r
 }\r
 \r
-function updateScreen(){\r
-       // Check if opening fullscreen\r
-       if( window.innerHeight > 91){\r
+function updateScreen()\r
+{\r
+       // check if opening fullscreen\r
+       if( window.innerHeight > 91)\r
                launchCalendar();\r
-       }\r
-       \r
-       if (useBackgroundImage){\r
+\r
+       if (useBackgroundImage) {\r
                // check for screen rotation\r
-               if (orientation != 'portrait' && screen.width == 360 && screen.height == 640){\r
+               if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'portrait';\r
                        document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
                        document.getElementById('body').style.backgroundColor = 'none';\r
                        window.widget.performTransition();\r
-               }else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360){\r
+               } else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'landscape';\r
                        document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
@@ -521,43 +529,53 @@ function updateScreen(){
        }\r
 }\r
 \r
-function launchCalendar(){\r
-   try{\r
+function launchCalendar()\r
+{\r
+       try {\r
                widget.openApplication(calendarApp, "");\r
                window.close();\r
-   }catch(e){\r
+       } catch(e) {\r
                error('starting Calendar App');\r
                return;\r
-   }\r
+       }\r
 }\r
 \r
-function init(){\r
-       try{\r
-               calendarService = device.getServiceObject("Service.Calendar", "IDataSource"); // call calendar service\r
-       }catch(e){\r
+function init()\r
+{\r
+       try {\r
+               // call calendar service\r
+               calendarService = device.getServiceObject("Service.Calendar", "IDataSource");\r
+       } catch(e) {\r
                error('loading Calendar service');\r
                return;\r
        }\r
+\r
        collectLocales();\r
        updateData();\r
        requestNotification();\r
-       window.setInterval('updateData()', 1000 * 60 * updateDataInterval); // start update interval every 5 minutes\r
+       window.setInterval('updateData()', 1000 * 60 * updateDataInterval);\r
 \r
        updateScreen();\r
        if (useBackgroundImage)\r
-               window.setInterval('updateScreen()', 1000 * 3); // check for screen rotation every 3 secs\r
+               // check for screen rotation every 3 secs\r
+               window.setInterval('updateScreen()', 1000 * 3);\r
 }\r
+\r
 </script>\r
+\r
 <style type="text/css">\r
-table{ margin:0px; padding:0px; border-spacing:0px; }\r
-td{ padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }\r
-#homescreenView{ width: 315px; height:91px; overflow:hidden; }\r
-#calendarList{ position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }\r
+table { margin:0px; padding:0px; border-spacing:0px; }\r
+td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }\r
+#homescreenView { width: 315px; height:91px; overflow:hidden; }\r
+#calendarList { position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }\r
 </style>\r
+\r
 </head>\r
+\r
 <body id="body" class="background">\r
 <div id="homescreenView">\r
        <div id="calendarList"></div>\r
 </div>\r
 </body>\r
-</html>
\ No newline at end of file
+\r
+</html>\r