Sync app project with current full app

Author: jmalone-nrao

OSX_build/MacGap1/JS Timer.xcodeproj/project.xcworkspace/xcuserdata/jmalone.xcuserdatad/UserInterfaceState.xcuserstate

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

OSX_build/MacGap1/MacGap/JS Timer-Info.plist

@@ -1,5 +1,5 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\froman\fcharset0 Times-Roman;}
+{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\froman\fcharset0 Times-Roman;}
 {\colortbl;\red255\green255\blue255;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
@@ -11,6 +11,7 @@
 Uses the following libraries and components:\
 \pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720
 \ls1\ilvl0\cf0 {\listtext	\'95	}Chart.js by Nick Downie (www.chartjs.org)\
+{\listtext	\'95	}jQuery by the jQuery foundation\
 \pard\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0 \
 This Mac App release uses code form the MacGap project.\

OSX_build/MacGap1/MacGap/en.lproj/Credits.rtf

@@ -16,7 +16,7 @@
 	<div id="presets" class="runpreset">
 	</div>
 	<div id="stdButtons" class="runpreset">
-        <button id="demo" onClick="startTimer(10,5)">Demo<br/>10s / 5s</button>
+        <button id="demo" onClick="setTimer(10,5)">Demo<br/>10s / 5s</button>
         <button onClick="showClock()">Real-time<br/>clock</button>
 	</div>
         <hr/>
@@ -32,7 +32,7 @@
 	    Use Q&amp;A
         </form>
 	<div class="runpreset">
-        <button onClick="startTimer(0,0)">Resume countdown</button>
+        <button onClick="beginTiming()">Resume countdown</button>
 	</div>
 	<hr/>
 	<button onClick="goConfigure()">Configure</button>

OSX_build/MacGap1/public/index.html

@@ -33,23 +33,10 @@ function pageStartup() {
 }
 
 function userTimer(F) {
-    startTimer(F.userTalk.value*60, F.userQA.value*60);
+    setTimer(F.userTalk.value*60, F.userQA.value*60);
 }
-function startTimer(talkSecs, qaSecs) {
-    elapsed=0;
-    qaTime=0;
-    if (talkSecs>0) {
-	$("#mode").html(jstConfig["presVocab"]);
-	ticks=talkSecs;
-	talkPart=1;
-	qaTime=qaSecs;
-    } else {
-	if (qaSecs>0) {
-	    $("#mode").html(jstConfig["qaVocab"]);
-	    talkPart=2;
-	    ticks=qaSecs;
-	}
-    }
+// Just start timing - don't reset the counters
+function beginTiming() {
     updateDisplay();
     $("#graphholder").show("slow");
     $("#gui").hide("fast");
@@ -59,6 +46,23 @@ function startTimer(talkSecs, qaSecs) {
     clearInterval(counter);
     counter=setInterval(timerFunc, 1000);
 }
+// Set the timing counters and start the clock timing
+function setTimer(talkSecs, qaSecs) {
+    qaTime=0;
+    if (talkSecs>0) {
+	elapsed=0;
+	$("#mode").html(jstConfig["presVocab"]);
+	ticks=talkSecs;
+	talkPart=1;
+	qaTime=qaSecs;
+    } else if (qaSecs>0) {
+	elapsed=0;
+	$("#mode").html(jstConfig["qaVocab"]);
+	talkPart=2;
+	ticks=qaSecs;
+    }
+    beginTiming();
+}
 function updateDisplay() {
     var clock=$("#timer");
     var x=document.getElementById('autoQA');
@@ -149,7 +153,7 @@ function setupGui() {
         var p=jstConfig.presets[i];
 	psec=p.pres*60;
 	qsec=p.qa*60;
-	bStr="<button id='preset"+i+"' onClick='startTimer("+psec+","+
+	bStr="<button id='preset"+i+"' onClick='setTimer("+psec+","+
 	    qsec+")'>"+p.name+"<br/>"+p.pres+" / "+p.qa+"</button>";
 	presetpane.append(bStr);
     }
@@ -192,7 +196,7 @@ function handleKey(evt) {
 	// Space bar - pause, or resume
 	case 32:
 	    if(running) { showGui(); }
-	    else { startTimer(0,0); }
+	    else { beginTiming(); }
 	    break;
 	// C key - display clock
 	case 99: