Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cols 1-3 and 1-5 working

  • Loading branch information...
commit 2da407b0041cac52cd6c15905f6df377efb7c258 1 parent d10daab
@ryanki1 authored
Showing with 2,023 additions and 52 deletions.
  1. +11 −3 AddCon_TravellingSalesman/AddCon_TravellingSalesman.csproj
  2. +4 −0 AddCon_TravellingSalesman/App_Start/BundleConfig.cs
  3. +79 −0 AddCon_TravellingSalesman/Content/app.css
  4. BIN  AddCon_TravellingSalesman/Content/images/puttPlug.png
  5. BIN  AddCon_TravellingSalesman/Content/images/salesmanPlaceholder.jpg
  6. +83 −3 AddCon_TravellingSalesman/Scripts/App/app.js
  7. +1 −1  AddCon_TravellingSalesman/Scripts/App/common.js
  8. +1,457 −0 AddCon_TravellingSalesman/Scripts/jsrender.js
  9. +2 −2 AddCon_TravellingSalesman/Spec/GeoOffice_Route.html
  10. +65 −0 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_android_4.html
  11. +17 −0 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_iPad_iOS4.html
  12. +17 −0 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_iPhone_iOS4.html
  13. +76 −0 AddCon_TravellingSalesman/Test/GeoOffice_xyz_android_4.js
  14. +49 −6 AddCon_TravellingSalesman/Test/GeoOffice_xyz_iPad_iOS4.js
  15. +73 −18 AddCon_TravellingSalesman/Test/GeoOffice_xyz_iPhone_iOS4.js
  16. +6 −2 AddCon_TravellingSalesman/Test/commonTest.js
  17. +2 −1  AddCon_TravellingSalesman/Views/SalesmanModels/Index.cshtml
  18. +36 −9 AddCon_TravellingSalesman/Views/SalesmanModels/SalesmanListControl.cshtml
  19. +37 −0 AddCon_TravellingSalesman/Views/SalesmanModels/SalesmanPagePuttControl.cshtml
  20. +8 −7 AddCon_TravellingSalesman/Views/Shared/_Layout.cshtml
  21. BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.dll
  22. BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.pdb
View
14 AddCon_TravellingSalesman/AddCon_TravellingSalesman.csproj
@@ -211,6 +211,9 @@
<Compile Include="Utilities\ExtensionMethods.cs" />
</ItemGroup>
<ItemGroup>
+ <Content Include="Content\app.css" />
+ <Content Include="Content\images\puttPlug.png" />
+ <Content Include="Content\images\salesmanPlaceholder.jpg" />
<Content Include="Content\jquery.mobile.acTravelSales.css" />
<Content Include="Content\jquery.mobile.acTravelSales.min.css" />
<Content Include="Content\oocss_all.css" />
@@ -245,6 +248,10 @@
<Content Include="Content\oocss_core\grid\grids_iphone.css" />
<Content Include="Content\oocss_core\grid\grid_rtl.css" />
<Content Include="Content\oocss_core\libraries.css" />
+ <Content Include="Content\oocss_core\media\assets\crystal_project\16x16\actions\1day.png" />
+ <Content Include="Content\oocss_core\media\assets\crystal_project\32x32\actions\player_play.png" />
+ <Content Include="Content\oocss_core\media\assets\crystal_project\readme.txt" />
+ <Content Include="Content\oocss_core\media\media.css" />
<Content Include="Content\oocss_core\template\template.css" />
<Content Include="Content\qunit-1.11.0.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -392,6 +399,7 @@
<Content Include="Scripts\jquery.validate.unobtrusive.min.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Scripts\jsrender.js" />
<Content Include="Scripts\knockout-2.1.0.debug.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -433,6 +441,7 @@
<Content Include="SignalR.Sample\SignalR.StockTicker.js" />
<Content Include="SignalR.Sample\StockTicker.css" />
<Content Include="SignalR.Sample\StockTicker.html" />
+ <Content Include="Spec\GeoOffice_xyz_android_4.html" />
<Content Include="Spec\GeoOffice_xyz_iPad_iOS4.html" />
<Content Include="Spec\GeoOffice_xyz_iPhone_iOS4.html" />
<Content Include="Spec\GeoOffice_NearestIndustrySalesman.html" />
@@ -440,6 +449,7 @@
<Content Include="Spec\GeoOffice_NearestSalesman.html" />
<Content Include="Spec\GeoOffice_Route.html" />
<Content Include="Test\commonTest.js" />
+ <Content Include="Test\GeoOffice_xyz_android_4.js" />
<Content Include="Test\GeoOffice_xyz_iPad_iOS4.js" />
<Content Include="Test\GeoOffice_NearestIndustrySalesman.js" />
<Content Include="Test\GeoOffice_NearestProductSalesman.js" />
@@ -456,9 +466,6 @@
<Content Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
- <Content Include="Content\Site.css">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
<Content Include="Scripts\_references.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -488,6 +495,7 @@
<Content Include="Views\SalesmanModels\dummySelector.cshtml" />
<Content Include="Views\SalesmanModels\SalesmanAdvert.cshtml" />
<Content Include="Views\Shared\_geoRanking.cshtml" />
+ <Content Include="Views\SalesmanModels\SalesmanPagePuttControl.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
View
4 AddCon_TravellingSalesman/App_Start/BundleConfig.cs
@@ -12,6 +12,9 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new ScriptBundle("~/bundles/geo").Include(
"~/Scripts/tutScript.js"));
+ bundles.Add(new ScriptBundle("~/bundles/jsRender").Include(
+ "~/Scripts/jsRender.js"));
+
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-1.*"));
@@ -53,6 +56,7 @@ public static void RegisterBundles(BundleCollection bundles)
"~/Content/themes/base/jquery.ui.datepicker.css",
"~/Content/themes/base/jquery.ui.progressbar.css",
"~/Content/themes/base/jquery.ui.theme.css"));
+ bundles.Add(new StyleBundle("~/Content/appcss").Include("~/Content/app.css"));
}
}
}
View
79 AddCon_TravellingSalesman/Content/app.css
@@ -0,0 +1,79 @@
+@charset "utf-8";
+
+#puttMat {
+clear: both;
+background-color: black;
+width: auto;
+height: 16px;
+}
+
+#puttMat ul {
+list-style-type: none;
+margin: 0px auto;
+}
+
+#puttMat ul li {
+display: inline;
+}
+
+#puttMat a:link, a:visited {
+float: left;
+height: 16px;
+background: -webkit-radial-gradient(circle, grey 20%, black 40%);
+background: -moz-radial-gradient(circle, grey 20%, black 40%);
+background: radial-gradient(circle, grey 20%, black 40%);
+}
+
+#puttMat a:hover, a:active {
+background: -webkit-radial-gradient(circle, white 20%, black 40%);
+background: -moz-radial-gradient(circle, white 20%, black 40%);
+background: radial-gradient(circle, white 20%, black 40%);
+}
+
+/* Alternative to above but more costly in terms of having underlying 16 x 32 sprite
+#puttMat a:link, #puttMat a:visited {
+float: left;
+height: 16px;
+background-image: url("../bilder/puttSprite.png");
+background-position: 0px -16px;
+background-repeat: no-repeat;
+-webkit-mask-box-image: -webkit-radial-gradient(circle, black 20%, transparent 40%);
+}
+
+#puttMat a:hover, a:active {
+background-image: url("../bilder/puttSprite.png");
+background-position: 0px 0px;
+background-repeat: no-repeat;
+-webkit-mask-box-image: -webkit-radial-gradient(circle, black 20%, transparent 40%);
+}
+*/
+
+.ballInTheHole {
+ background: -webkit-radial-gradient(circle, white 20%, black 40%)!important;
+ background: -moz-radial-gradient(circle, white 20%, black 40%)!important;
+ background: radial-gradient(circle, white 20%, black 40%)!important;
+}
+.activePage {
+ /*display: block;*/
+ visibility: visible;
+ /*position: absolute;*/
+}
+.row0 {
+ /*position: static;*/ /* We wish to preserve float on 1st row for grid-size 3 */
+ /* grid-size 5? */
+}
+.inactivePage {
+ visibility: hidden;
+ /*display: none;*/
+}
+.main {
+ padding-top: 75px;
+ position: relative;
+ overflow: hidden;
+}
+.unaffectLayout {
+ display: none;
+}
+.affectLayout {
+ display: block;
+}
View
BIN  AddCon_TravellingSalesman/Content/images/puttPlug.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  AddCon_TravellingSalesman/Content/images/salesmanPlaceholder.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
86 AddCon_TravellingSalesman/Scripts/App/app.js
@@ -21,7 +21,7 @@
log("Error - User location not locked on.");
},
showNearestFirst: function(geoTestCBSuccess, geoTestCBError){
- debugger;
+ //debugger;
if (localStorage.lat)
{
$.ajax({
@@ -45,7 +45,7 @@
}
},
geoRankingCallbackSuccess: function (position) {
- debugger;
+ //debugger;
geoAllowLocateUser(position);
},
geoRankingCallbackError: function () {
@@ -139,11 +139,91 @@
app.setSalesman(params);
},
googleMapsReady: function () {
- debugger;
+ //debugger;
var userLat = app.user.coords ? app.user.coords.latitude : null;
var userLong = app.user.coords ? app.user.coords.longitude : null;
//var ret = tut.maps.ready([userLat, userLong]);
tut.maps.origin = new google.maps.LatLng(app.selectedSalesman.coords.latitude, app.selectedSalesman.coords.longitude);
return tut.maps.drawRoute([userLat, userLong]);
+ },
+ // Salesmanlist puttControl
+ getPageFlickCount: function (leaveImpression) {
+ debugger;
+ var numPages = 0;
+ var leadingTop = -1;
+ $.each($(".unit"), function (index,ele) {
+ debugger;
+ var coordinates = $(ele).offset();
+ if (coordinates.top > leadingTop) {
+ numPages = numPages + 1;
+ leadingTop = coordinates.top;
+ }
+ if (leaveImpression) {
+ $(ele).addClass("row" + (numPages-1));
+ }
+ });
+ return numPages;
+ },
+ scorePuttMatRows: function () {
+ //debugger;
+ var leaveImpression = true;
+ app.getPageFlickCount(leaveImpression);
+ },
+ primePuttMat: function() {
+ // For every page (row) create a hole for putting
+ //debugger;
+ var numPages = app.getPageFlickCount();
+ var modelStr = "{\"List\":[";
+ for (var i = 0; i < numPages; i++) {
+ modelStr = modelStr + "{\"dummy\": \"0\"},";
+ }
+ modelStr = modelStr.substring(0, modelStr.length-1) + "]}" ; // Remove trailing comma and finish up
+ app.unwravelMat($.parseJSON(modelStr));
+ // Wireup clickability of holes
+ $.each($("#puttMat a"), function(index, ele) {
+ //debugger;
+ $(ele).click(function(evt) {
+ //debugger;
+ app.teeOff(index);
+ });
+ });
+ return numPages;
+ },
+ unwravelMat: function (model) {
+ //debugger;
+ $('#puttMatList').html($('#pagePuttTemplate').render(model));
+ },
+ resetPuttMat: function () {
+ $(".ballInTheHole").removeClass("ballInTheHole");
+ },
+ teeOff: function (index) {
+ //debugger;
+ app.resetPuttMat();
+ if (index >= 0) {
+ $("#puttMat a:eq(" + index + ")").addClass("ballInTheHole");
+ app.cuePuttMatRow(index);
+ }
+ else {
+ $("#puttMat a:first").addClass("ballInTheHole");
+ app.cuePuttMatRow(0);
+ }
+ },
+ resetPuttMatRows: function () {
+ $(".activePage").removeClass("activePage").addClass("inactivePage");
+ },
+ cuePuttMatRow: function (hole) {
+ app.resetPuttMatRows();
+ $.each($("div .unit"), function (index, ele) {
+ //debugger;
+ if ($(ele).hasClass("row" + hole)) {
+ $(ele).removeClass("unaffectLayout").addClass("affectLayout");
+ $(ele).removeClass("inactivePage").addClass("activePage");
+ }
+ else {
+ // Inactive rows should disappear so that active row positioned at the top
+ $(ele).removeClass("affectLayout").addClass("unaffectLayout");
+ $(ele).removeClass("activePage").addClass("inactivePage");
+ }
+ });
}
}
View
2  AddCon_TravellingSalesman/Scripts/App/common.js
@@ -1,5 +1,5 @@
function geoAllowLocateUser(position) {
- debugger;
+ //debugger;
log("User location locked-on.");
if (position) {
localStorage.lng = position.coords.longitude;
View
1,457 AddCon_TravellingSalesman/Scripts/jsrender.js
@@ -0,0 +1,1457 @@
+/*! JsRender v1.0pre: http://github.com/BorisMoore/jsrender */
+/*
+* Optimized version of jQuery Templates, for rendering to string.
+* Does not require jQuery, or HTML DOM
+* Integrates with JsViews (http://github.com/BorisMoore/jsviews)
+* Copyright 2013, Boris Moore
+* Released under the MIT License.
+*/
+// informal pre beta commit counter: 30 (Beta Candidate)
+
+(function(global, jQuery, undefined) {
+ // global is the this object, which is window when running in the usual browser environment.
+ "use strict";
+
+ if (jQuery && jQuery.views || global.jsviews) { return; } // JsRender is already loaded
+
+ //========================== Top-level vars ==========================
+
+ var versionNumber = "v1.0pre",
+
+ $, jsvStoreName, rTag, rTmplString,
+//TODO tmplFnsCache = {},
+ delimOpenChar0 = "{", delimOpenChar1 = "{", delimCloseChar0 = "}", delimCloseChar1 = "}", linkChar = "^",
+
+ rPath = /^(?:null|true|false|\d[\d.]*|([\w$]+|\.|~([\w$]+)|#(view|([\w$]+))?)([\w$.^]*?)(?:[.[^]([\w$]+)\]?)?)$/g,
+ // object helper view viewProperty pathTokens leafToken
+
+ rParams = /(\()(?=\s*\()|(?:([([])\s*)?(?:([#~]?[\w$.^]+)?\s*((\+\+|--)|\+|-|&&|\|\||===|!==|==|!=|<=|>=|[<>%*!:?\/]|(=))\s*|([#~]?[\w$.^]+)([([])?)|(,\s*)|(\(?)\\?(?:(')|("))|(?:\s*((\))(?=\s*\.|\s*\^)|\)|\])([([]?))|(\s+)/g,
+ // lftPrn lftPrn2 path operator err eq path2 prn comma lftPrn2 apos quot rtPrn rtPrnDot prn2 space
+ // (left paren? followed by (path? followed by operator) or (path followed by left paren?)) or comma or apos or quot or right paren or space
+
+ rNewLine = /\s*\n\s*/g,
+ rUnescapeQuotes = /\\(['"])/g,
+ // escape quotes and \ character
+ rEscapeQuotes = /([\\'"])/g,
+ rBuildHash = /\x08(~)?([^\x08]+)\x08/g,
+ rTestElseIf = /^if\s/,
+ rFirstElem = /<(\w+)[>\s]/,
+ rPrevElem = /<(\w+)[^>\/]*>[^>]*$/,
+ rAttrEncode = /[<"'&]/g,
+ rHtmlEncode = /[><"'&]/g,
+ autoTmplName = 0,
+ viewId = 0,
+ charEntities = {
+ "&": "&amp;",
+ "<": "&lt;",
+ ">": "&gt;",
+ "\x00": "&#0;",
+ "'": "&#39;",
+ '"': "&#34;"
+ },
+ tmplAttr = "data-jsv-tmpl",
+ slice = [].slice,
+
+ $render = {},
+ jsvStores = {
+ template: {
+ compile: compileTmpl
+ },
+ tag: {
+ compile: compileTag
+ },
+ helper: {},
+ converter: {}
+ },
+
+ // jsviews object ($.views if jQuery is loaded)
+ $views = {
+ jsviews: versionNumber,
+ render: $render,
+ View: View,
+ settings: {
+ delimiters: $viewsDelimiters,
+ debugMode: true,
+ tryCatch: true
+ },
+ sub: {
+ // subscription, e.g. JsViews integration
+ Error: JsViewsError,
+ tmplFn: tmplFn,
+ parse: parseParams,
+ extend: $extend,
+ error: error,
+ syntaxError: syntaxError
+//TODO invoke: $invoke
+ },
+ _cnvt: convertVal,
+ _tag: renderTag,
+
+ // TODO provide better debug experience - e.g. support $.views.onError callback
+ _err: function(e) {
+ // Place a breakpoint here to intercept template rendering errors
+ return $viewsSettings.debugMode ? ("Error: " + (e.message || e)) + ". " : '';
+ }
+ };
+
+ function JsViewsError(message, object) {
+ // Error exception type for JsViews/JsRender
+ // Override of $.views.sub.Error is possible
+ if (object && object.onError) {
+ if (object.onError(message) === false) {
+ return;
+ }
+ }
+ this.name = "JsRender Error";
+ this.message = message || "JsRender error";
+ }
+
+ function $extend(target, source) {
+ var name;
+ target = target || {};
+ for (name in source) {
+ target[name] = source[name];
+ }
+ return target;
+ }
+
+//TODO function $invoke() {
+// try {
+// return arguments[1].apply(arguments[0], arguments[2]);
+// }
+// catch(e) {
+// throw new $views.sub.Error(e, arguments[0]);
+// }
+// }
+
+ (JsViewsError.prototype = new Error()).constructor = JsViewsError;
+
+ //========================== Top-level functions ==========================
+
+ //===================
+ // jsviews.delimiters
+ //===================
+ function $viewsDelimiters(openChars, closeChars, link) {
+ // Set the tag opening and closing delimiters and 'link' character. Default is "{{", "}}" and "^"
+ // openChars, closeChars: opening and closing strings, each with two characters
+
+ if (!$viewsSub.rTag || arguments.length) {
+ delimOpenChar0 = openChars ? openChars.charAt(0) : delimOpenChar0; // Escape the characters - since they could be regex special characters
+ delimOpenChar1 = openChars ? openChars.charAt(1) : delimOpenChar1;
+ delimCloseChar0 = closeChars ? closeChars.charAt(0) : delimCloseChar0;
+ delimCloseChar1 = closeChars ? closeChars.charAt(1) : delimCloseChar1;
+ linkChar = link || linkChar;
+ openChars = "\\" + delimOpenChar0 + "(\\" + linkChar + ")?\\" + delimOpenChar1; // Default is "{^{"
+ closeChars = "\\" + delimCloseChar0 + "\\" + delimCloseChar1; // Default is "}}"
+ // Build regex with new delimiters
+ // tag (followed by / space or }) or cvtr+colon or html or code
+ rTag = "(?:(?:(\\w+(?=[\\/\\s\\" + delimCloseChar0 + "]))|(?:(\\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\\*)))"
+ + "\\s*((?:[^\\" + delimCloseChar0 + "]|\\" + delimCloseChar0 + "(?!\\" + delimCloseChar1 + "))*?)";
+
+ // make rTag available to JsViews (or other components) for parsing binding expressions
+ $viewsSub.rTag = rTag + ")";
+
+ rTag = new RegExp(openChars + rTag + "(\\/)?|(?:\\/(\\w+)))" + closeChars, "g");
+
+ // Default: bind tag converter colon html comment code params slash closeBlock
+ // /{(\^)?{(?:(?:(\w+(?=[\/\s}]))|(?:(\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\*)))\s*((?:[^}]|}(?!}))*?)(\/)?|(?:\/(\w+)))}}/g
+
+ rTmplString = new RegExp("<.*>|([^\\\\]|^)[{}]|" + openChars + ".*" + closeChars);
+ // rTmplString looks for html tags or { or } char not preceded by \\, or JsRender tags {{xxx}}. Each of these strings are considered
+ // NOT to be jQuery selectors
+ }
+ return [delimOpenChar0, delimOpenChar1, delimCloseChar0, delimCloseChar1, linkChar];
+ }
+
+ //=========
+ // View.get
+ //=========
+
+ function getView(inner, type) { //view.get(inner, type)
+ if (!type) {
+ // view.get(type)
+ type = inner;
+ inner = undefined;
+ }
+
+ var views, i, l, found,
+ view = this,
+ root = !type || type === "root";
+ // If type is undefined, returns root view (view under top view).
+
+ if (inner) {
+ // Go through views - this one, and all nested ones, depth-first - and return first one with given type.
+ found = view.type === type ? view : undefined;
+ if (!found) {
+ views = view.views;
+ if (view._.useKey) {
+ for (i in views) {
+ if (found = views[i].get(inner, type)) {
+ break;
+ }
+ }
+ } else for (i = 0, l = views.length; !found && i < l; i++) {
+ found = views[i].get(inner, type);
+ }
+ }
+ } else if (root) {
+ // Find root view. (view whose parent is top view)
+ while (view.parent.parent) {
+ found = view = view.parent;
+ }
+ } else while (view && !found) {
+ // Go through views - this one, and all parent ones - and return first one with given type.
+ found = view.type === type ? view : undefined;
+ view = view.parent;
+ }
+ return found;
+ }
+
+ function getIndex() {
+ var view = this.get("item");
+ return view ? view.index : undefined;
+ }
+
+ getIndex.depends = function() {
+ return [this.get("item"), "index"];
+ };
+
+ //==========
+ // View.hlp
+ //==========
+
+ function getHelper(helper) {
+ // Helper method called as view.hlp(key) from compiled template, for helper functions or template parameters ~foo
+ var wrapped,
+ view = this,
+ res = (view.ctx || {})[helper];
+
+ res = res === undefined ? view.getRsc("helpers", helper) : res;
+
+ if (res) {
+ if (typeof res === "function") {
+ wrapped = function() {
+ // If it is of type function, we will wrap it so it gets called with view as 'this' context.
+ // If the helper ~foo() was in a data-link expression, the view will have a 'temporary' linkCtx property too.
+ // However note that helper functions on deeper paths will not have access to view and tagCtx.
+ // For example, ~util.foo() will have the ~util object as 'this' pointer
+ return res.apply(view, arguments);
+ };
+ $extend(wrapped, res);
+ }
+ }
+ return wrapped || res;
+ }
+
+ //==============
+ // jsviews._cnvt
+ //==============
+
+ function convertVal(converter, view, tagCtx) {
+ // self is template object or linkCtx object
+ var tmplConverter, tag, value,
+ boundTagCtx = +tagCtx === tagCtx && tagCtx, // if value is an integer, then it is the key for the boundTagCtx
+ linkCtx = view.linkCtx;
+
+ if (boundTagCtx) {
+ // Call compiled function which returns the tagCtxs for current data
+ tagCtx = (boundTagCtx = view.tmpl.bnds[boundTagCtx-1])(view.data, view, $views);
+ }
+
+ value = tagCtx.args[0];
+
+ if (converter || boundTagCtx) {
+ tag = linkCtx && linkCtx.tag || {
+ _: {
+ inline: !linkCtx
+ },
+ tagName: converter + ":",
+ flow: true,
+ _is: "tag"
+ };
+
+ tag._.bnd = boundTagCtx;
+
+ if (linkCtx) {
+ linkCtx.tag = tag;
+ tag.linkCtx = linkCtx;
+ tagCtx.ctx = extendCtx(tagCtx.ctx, linkCtx.view.ctx);
+ }
+ tag.tagCtx = tagCtx;
+ tagCtx.view = view;
+
+ tag.ctx = tagCtx.ctx || {};
+ delete tagCtx.ctx;
+ // Provide this tag on view, for addBindingMarkers on bound tags to add the tag to view._.bnds, associated with the tag id,
+ view._.tag = tag;
+
+ converter = converter !== "true" && converter; // If there is a convertBack but no convert, converter will be "true"
+
+ if (converter && ((tmplConverter = view.getRsc("converters", converter)) || error("Unknown converter: {{"+ converter + ":"))) {
+ // A call to {{cnvt: ... }} or {^{cnvt: ... }} or data-link="{cnvt: ... }"
+ tag.depends = tmplConverter.depends;
+ value = tmplConverter.apply(tag, tagCtx.args);
+ }
+ // Call onRender (used by JsViews if present, to add binding annotations around rendered content)
+ value = boundTagCtx && view._.onRender
+ ? view._.onRender(value, view, boundTagCtx)
+ : value;
+ }
+ return value;
+ }
+
+ //=============
+ // jsviews._tag
+ //=============
+
+ function getResource(storeName, item) {
+ var res,
+ view = this,
+ store = $views[storeName];
+
+ res = store && store[item];
+ while ((res === undefined) && view) {
+ store = view.tmpl[storeName];
+ res = store && store[item];
+ view = view.parent;
+ }
+ return res;
+ }
+
+ function renderTag(tagName, parentView, tmpl, tagCtxs) {
+ // Called from within compiled template function, to render a template tag
+ // Returns the rendered tag
+
+ var render, tag, tags, attr, isElse, parentTag, i, l, itemRet, tagCtx, tagCtxCtx, content, boundTagFn, tagDef,
+ ret = "",
+ boundTagKey = +tagCtxs === tagCtxs && tagCtxs, // if tagCtxs is an integer, then it is the boundTagKey
+ linkCtx = parentView.linkCtx || 0,
+ ctx = parentView.ctx,
+ parentTmpl = tmpl || parentView.tmpl,
+ parentView_ = parentView._,
+ tag = tagName._is === "tag" && tagName;
+
+ // Provide tagCtx, linkCtx and ctx access from tag
+ if (boundTagKey) {
+ // if tagCtxs is an integer, we are data binding
+ // Call compiled function which returns the tagCtxs for current data
+ tagCtxs = (boundTagFn = parentTmpl.bnds[boundTagKey-1])(parentView.data, parentView, $views);
+ }
+
+ l = tagCtxs.length;
+ tag = tag || linkCtx.tag;
+ for (i = 0; i < l; i++) {
+ tagCtx = tagCtxs[i];
+
+ // Set the tmpl property to the content of the block tag, unless set as an override property on the tag
+ content = tagCtx.tmpl;
+ content = tagCtx.content = content && parentTmpl.tmpls[content - 1];
+ tmpl = tagCtx.props.tmpl;
+ if (!i && (!tmpl || !tag)) {
+ tagDef = parentView.getRsc("tags", tagName) || error("Unknown tag: {{"+ tagName + "}}");
+ }
+ tmpl = tmpl || !i && tagDef.template || content;
+ tmpl = "" + tmpl === tmpl // if a string
+ ? parentView.getRsc("templates", tmpl) || $templates(tmpl)
+ : tmpl;
+
+ $extend( tagCtx, {
+ tmpl: tmpl,
+ render: renderContent,
+ index: i,
+ view: parentView,
+ ctx: extendCtx(tagCtx.ctx, ctx) // Extend parentView.ctx
+ }); // Extend parentView.ctx
+
+ if (!tag) {
+ // This will only be hit for initial tagCtx (not for {{else}}) - if the tag instance does not exist yet
+ // Instantiate tag if it does not yet exist
+ if (tagDef.init) {
+ // If the tag has not already been instantiated, we will create a new instance.
+ // ~tag will access the tag, even within the rendering of the template content of this tag.
+ // From child/descendant tags, can access using ~tag.parent, or ~parentTags.tagName
+// TODO provide error handling owned by the tag - using tag.onError
+// try {
+ tag = new tagDef.init(tagCtx, linkCtx, ctx);
+// }
+// catch(e) {
+// tagDef.onError(e);
+// }
+ // Set attr on linkCtx to ensure outputting to the correct target attribute.
+ tag.attr = tag.attr || tagDef.attr || undefined;
+ // Setting either linkCtx.attr or this.attr in the init() allows per-instance choice of target attrib.
+ } else {
+ // This is a simple tag declared as a function. We won't instantiate a specific tag constructor - just a standard instance object.
+ tag = {
+ // tag instance object if no init constructor
+ render: tagDef.render
+ };
+ }
+ tag._ = {
+ inline: !linkCtx
+ };
+ if (linkCtx) {
+ // Set attr on linkCtx to ensure outputting to the correct target attribute.
+ linkCtx.attr = tag.attr = linkCtx.attr || tag.attr;
+ linkCtx.tag = tag;
+ tag.linkCtx = linkCtx;
+ }
+ if (tag._.bnd = boundTagFn || linkCtx) {
+ // Bound if {^{tag...}} or data-link="{tag...}"
+ tag._.arrVws = {};
+ }
+ tag.tagName = tagName;
+ tag.parent = parentTag = ctx && ctx.tag,
+ tag._is = "tag";
+ // Provide this tag on view, for addBindingMarkers on bound tags to add the tag to view._.bnds, associated with the tag id,
+ }
+ parentView_.tag = tag;
+ tagCtx.tag = tag;
+ tag.tagCtxs = tagCtxs;
+ tag.rendering = {}; // Provide object for state during render calls to tag and elses. (Used by {{if}} and {{for}}...)
+
+ if (!tag.flow) {
+ tagCtxCtx = tagCtx.ctx = tagCtx.ctx || {};
+
+ // tags hash: tag.ctx.tags, merged with parentView.ctx.tags,
+ tags = tagCtxCtx.parentTags = ctx && extendCtx(tagCtxCtx.parentTags, ctx.parentTags) || {};
+ if (parentTag) {
+ tags[parentTag.tagName] = parentTag;
+ }
+ tagCtxCtx.tag = tag;
+ }
+ }
+ for (i = 0; i < l; i++) {
+ tagCtx = tag.tagCtx = tagCtxs[i];
+ tag.ctx = tagCtx.ctx;
+
+ if (render = tag.render) {
+ itemRet = render.apply(tag, tagCtx.args);
+ }
+ ret += itemRet !== undefined
+ ? itemRet // Return result of render function unless it is undefined, in which case return rendered template
+ : tagCtx.tmpl
+ // render template/content on the current data item
+ ? tagCtx.render()
+ : ""; // No return value from render, and no template/content defined, so return ""
+ }
+ delete tag.rendering;
+
+ tag.tagCtx = tag.tagCtxs[0];
+ tag.ctx= tag.tagCtx.ctx;
+
+ if (tag._.inline && (attr = tag.attr) && attr !== "html") {
+ ret = attr === "text"
+ ? $converters.html(ret)
+ : "";
+ }
+ return ret = boundTagKey && parentView._.onRender
+ // Call onRender (used by JsViews if present, to add binding annotations around rendered content)
+ ? parentView._.onRender(ret, parentView, boundTagKey)
+ : ret;
+ }
+
+ //=================
+ // View constructor
+ //=================
+
+ function View(context, type, parentView, data, template, key, contentTmpl, onRender) {
+ // Constructor for view object in view hierarchy. (Augmented by JsViews if JsViews is loaded)
+ var views, parentView_, tag,
+ isArray = type === "array",
+ self_ = {
+ key: 0,
+ useKey: isArray ? 0 : 1,
+ id: "" + viewId++,
+ onRender: onRender,
+ bnds: {}
+ },
+ self = {
+ data: data,
+ tmpl: template,
+ content: contentTmpl,
+ views: isArray ? [] : {},
+ parent: parentView,
+ ctx: context,
+ type: type,
+ // If the data is an array, this is an 'array view' with a views array for each child 'item view'
+ // If the data is not an array, this is an 'item view' with a views 'map' object for any child nested views
+ // ._.useKey is non zero if is not an 'array view' (owning a data array). Uuse this as next key for adding to child views map
+ get: getView,
+ getIndex: getIndex,
+ getRsc: getResource,
+ hlp: getHelper,
+ _: self_,
+ _is: "view"
+ };
+ if (parentView) {
+ views = parentView.views;
+ parentView_ = parentView._;
+ if (parentView_.useKey) {
+ // Parent is an 'item view'. Add this view to its views object
+ // self._key = is the key in the parent view map
+ views[self_.key = "_" + parentView_.useKey++] = self;
+ tag = parentView_.tag;
+ self_.bnd = isArray && (!tag || !!tag._.bnd && tag); // For array views that are data bound for collection change events, set the
+ // view._.bnd property to true for top-level link() or data-link="{for}", or to the tag instance for a data- bound tag, e.g. {^{for ...}}
+ } else {
+ // Parent is an 'array view'. Add this view to its views array
+ views.splice(
+ // self._.key = self.index - the index in the parent view array
+ self_.key = self.index =
+ key !== undefined
+ ? key
+ : views.length,
+ 0, self);
+ }
+ // If no context was passed in, use parent context
+ // If context was passed in, it should have been merged already with parent context
+ self.ctx = context || parentView.ctx;
+ }
+ return self;
+ }
+
+ //=============
+ // Registration
+ //=============
+
+ function compileChildResources(parentTmpl) {
+ var storeName, resources, resourceName, settings, compile;
+ for (storeName in jsvStores) {
+ settings = jsvStores[storeName];
+ if ((compile = settings.compile) && (resources = parentTmpl[storeName + "s"])) {
+ for (resourceName in resources) {
+ // compile child resource declarations (templates, tags, converters or helpers)
+ resources[resourceName] = compile(resourceName, resources[resourceName], parentTmpl, storeName, settings);
+ }
+ }
+ }
+ }
+
+ function compileTag(name, item, parentTmpl) {
+ var init, tmpl;
+ if (typeof item === "function") {
+ // Simple tag declared as function. No presenter instantation.
+ item = {
+ depends: item.depends,
+ render: item
+ };
+ } else {
+ // Tag declared as object, used as the prototype for tag instantiation (control/presenter)
+ if (tmpl = item.template) {
+ item.template = "" + tmpl === tmpl ? ($templates[tmpl] || $templates(tmpl)) : tmpl;
+ }
+ if (item.init !== false) {
+ init = item.init = item.init || function(tagCtx) {};
+ init.prototype = item;
+ (init.prototype = item).constructor = init;
+ }
+ }
+ if (parentTmpl) {
+ item._parentTmpl = parentTmpl;
+ }
+//TODO item.onError = function(e) {
+// var error;
+// if (error = this.prototype.onError) {
+// error.call(this, e);
+// } else {
+// throw e;
+// }
+// }
+ return item;
+ }
+
+ function compileTmpl(name, tmpl, parentTmpl, storeName, storeSettings, options) {
+ // tmpl is either a template object, a selector for a template script block, the name of a compiled template, or a template object
+
+ //==== nested functions ====
+ function tmplOrMarkupFromStr(value) {
+ // If value is of type string - treat as selector, or name of compiled template
+ // Return the template object, if already compiled, or the markup string
+
+ if (("" + value === value) || value.nodeType > 0) {
+ try {
+ elem = value.nodeType > 0
+ ? value
+ : !rTmplString.test(value)
+ // If value is a string and does not contain HTML or tag content, then test as selector
+ && jQuery && jQuery(global.document).find(value)[0];
+ // If selector is valid and returns at least one element, get first element
+ // If invalid, jQuery will throw. We will stay with the original string.
+ } catch (e) {}
+
+ if (elem) {
+ // Generally this is a script element.
+ // However we allow it to be any element, so you can for example take the content of a div,
+ // use it as a template, and replace it by the same content rendered against data.
+ // e.g. for linking the content of a div to a container, and using the initial content as template:
+ // $.link("#content", model, {tmpl: "#content"});
+
+ value = elem.getAttribute(tmplAttr);
+ name = name || value;
+ value = $templates[value];
+ if (!value) {
+ // Not already compiled and cached, so compile and cache the name
+ // Create a name for compiled template if none provided
+ name = name || "_" + autoTmplName++;
+ elem.setAttribute(tmplAttr, name);
+ // Use tmpl as options
+ value = $templates[name] = compileTmpl(name, elem.innerHTML, parentTmpl, storeName, storeSettings, options);
+ }
+ }
+ return value;
+ }
+ // If value is not a string, return undefined
+ }
+
+ var tmplOrMarkup, elem;
+
+ //==== Compile the template ====
+ tmpl = tmpl || "";
+ tmplOrMarkup = tmplOrMarkupFromStr(tmpl);
+
+ // If options, then this was already compiled from a (script) element template declaration.
+ // If not, then if tmpl is a template object, use it for options
+ options = options || (tmpl.markup ? tmpl : {});
+ options.tmplName = name;
+ if (parentTmpl) {
+ options._parentTmpl = parentTmpl;
+ }
+ // If tmpl is not a markup string or a selector string, then it must be a template object
+ // In that case, get it from the markup property of the object
+ if (!tmplOrMarkup && tmpl.markup && (tmplOrMarkup = tmplOrMarkupFromStr(tmpl.markup))) {
+ if (tmplOrMarkup.fn && (tmplOrMarkup.debug !== tmpl.debug || tmplOrMarkup.allowCode !== tmpl.allowCode)) {
+ // if the string references a compiled template object, but the debug or allowCode props are different, need to recompile
+ tmplOrMarkup = tmplOrMarkup.markup;
+ }
+ }
+ if (tmplOrMarkup !== undefined) {
+ if (name && !parentTmpl) {
+ $render[name] = function() {
+ return tmpl.render.apply(tmpl, arguments);
+ };
+ }
+ if (tmplOrMarkup.fn || tmpl.fn) {
+ // tmpl is already compiled, so use it, or if different name is provided, clone it
+ if (tmplOrMarkup.fn) {
+ if (name && name !== tmplOrMarkup.tmplName) {
+ tmpl = extendCtx(options, tmplOrMarkup);
+ } else {
+ tmpl = tmplOrMarkup;
+ }
+ }
+ } else {
+ // tmplOrMarkup is a markup string, not a compiled template
+ // Create template object
+ tmpl = TmplObject(tmplOrMarkup, options);
+ // Compile to AST and then to compiled function
+ tmplFn(tmplOrMarkup, tmpl);
+ }
+ compileChildResources(options);
+ return tmpl;
+ }
+ }
+ //==== /end of function compile ====
+
+ function TmplObject(markup, options) {
+ // Template object constructor
+ var htmlTag,
+ wrapMap = $viewsSettings.wrapMap || {},
+ tmpl = $extend(
+ {
+ markup: markup,
+ tmpls: [],
+ links: {}, // Compiled functions for link expressions
+ tags: {}, // Compiled functions for bound tag expressions
+ bnds: [],
+ _is: "template",
+ render: renderContent
+ },
+ options
+ );
+
+ if (!options.htmlTag) {
+ // Set tmpl.tag to the top-level HTML tag used in the template, if any...
+ htmlTag = rFirstElem.exec(markup);
+ tmpl.htmlTag = htmlTag ? htmlTag[1].toLowerCase() : "";
+ }
+ htmlTag = wrapMap[tmpl.htmlTag];
+ if (htmlTag && htmlTag !== wrapMap.div) {
+ // When using JsViews, we trim templates which are inserted into HTML contexts where text nodes are not rendered (i.e. not 'Phrasing Content').
+ tmpl.markup = $.trim(tmpl.markup);
+ tmpl._elCnt = true; // element content model (no rendered text nodes), not phrasing content model
+ }
+
+ return tmpl;
+ }
+
+ function registerStore(storeName, storeSettings) {
+
+ function theStore(name, item, parentTmpl) {
+ // The store is also the function used to add items to the store. e.g. $.templates, or $.views.tags
+
+ // For store of name 'thing', Call as:
+ // $.views.things(items[, parentTmpl]),
+ // or $.views.things(name, item[, parentTmpl])
+
+ var onStore, compile, itemName, thisStore;
+
+ if (name && "" + name !== name && !name.nodeType && !name.markup) {
+ // Call to $.views.things(items[, parentTmpl]),
+
+ // Adding items to the store
+ // If name is a map, then item is parentTmpl. Iterate over map and call store for key.
+ for (itemName in name) {
+ theStore(itemName, name[itemName], item);
+ }
+ return $views;
+ }
+ thisStore = parentTmpl ? parentTmpl[storeNames] = parentTmpl[storeNames] || {} : theStore;
+
+ // Adding a single unnamed item to the store
+ if (item === undefined) {
+ item = name;
+ name = undefined;
+ }
+ compile = storeSettings.compile;
+ if (onStore = $viewsSub.onBeforeStoreItem) {
+ // e.g. provide an external compiler or preprocess the item.
+ compile = onStore(thisStore, name, item, compile) || compile;
+ }
+ if (!name) {
+ item = compile(undefined, item);
+ } else if ("" + name === name) { // name must be a string
+ if (item === null) {
+ // If item is null, delete this entry
+ delete thisStore[name];
+ } else {
+ thisStore[name] = compile ? (item = compile(name, item, parentTmpl, storeName, storeSettings)) : item;
+ }
+ }
+ if (item) {
+ item._is = storeName;
+ }
+ if (onStore = $viewsSub.onStoreItem) {
+ // e.g. JsViews integration
+ onStore(thisStore, name, item, compile);
+ }
+ return item;
+ }
+
+ var storeNames = storeName + "s";
+
+ $views[storeNames] = theStore;
+ jsvStores[storeName] = storeSettings;
+ }
+
+ //==============
+ // renderContent
+ //==============
+
+ function renderContent(data, context, parentView, key, isLayout, onRender) {
+ // Render template against data as a tree of subviews (nested rendered template instances), or as a string (top-level template).
+ // If the data is the parent view, treat as layout template, re-render with the same data context.
+ var i, l, dataItem, newView, childView, itemResult, swapContent, tagCtx, contentTmpl, tag_, outerOnRender, tmplName, tmpl,
+ self = this,
+ allowDataLink = !self.attr || self.attr === "html",
+ result = "";
+
+ if (key === true) {
+ swapContent = true;
+ key = 0;
+ }
+ if (self.tag) {
+ // This is a call from renderTag or tagCtx.render()
+ tagCtx = self;
+ self = self.tag;
+ tag_ = self._;
+ tmplName = self.tagName;
+ tmpl = tagCtx.tmpl;
+ context = extendCtx(context, self.ctx);
+ contentTmpl = tagCtx.content; // The wrapped content - to be added to views, below
+ if ( tagCtx.props.link === false ) {
+ // link=false setting on block tag
+ // We will override inherited value of link by the explicit setting link=false taken from props
+ // The child views of an unlinked view are also unlinked. So setting child back to true will not have any effect.
+ context = context || {};
+ context.link = false;
+ }
+ parentView = parentView || tagCtx.view;
+ data = data === undefined ? parentView : data;
+ } else {
+ tmpl = self.jquery && (self[0] || error('Unknown template: "' + self.selector + '"')) // This is a call from $(selector).render
+ || self;
+ }
+ if (tmpl) {
+ if (!parentView && data && data._is === "view") {
+ parentView = data; // When passing in a view to render or link (and not passing in a parent view) use the passed in view as parentView
+ }
+ if (parentView) {
+ contentTmpl = contentTmpl || parentView.content; // The wrapped content - to be added as #content property on views, below
+ onRender = onRender || parentView._.onRender;
+ if (data === parentView) {
+ // Inherit the data from the parent view.
+ // This may be the contents of an {{if}} block
+ // Set isLayout = true so we don't iterate the if block if the data is an array.
+ data = parentView.data;
+ isLayout = true;
+ }
+ context = extendCtx(context, parentView.ctx);
+ }
+ if (!parentView || parentView.data === undefined) {
+ (context = context || {}).root = data; // Provide ~root as shortcut to top-level data.
+ }
+
+ // Set additional context on views created here, (as modified context inherited from the parent, and to be inherited by child views)
+ // Note: If no jQuery, $extend does not support chained copies - so limit extend() to two parameters
+
+ if (!tmpl.fn) {
+ tmpl = $templates[tmpl] || $templates(tmpl);
+ }
+
+ if (tmpl) {
+ onRender = (context && context.link) !== false && allowDataLink && onRender;
+ // If link===false, do not call onRender, so no data-linking marker nodes
+ outerOnRender = onRender;
+ if (onRender === true) {
+ // Used by view.refresh(). Don't create a new wrapper view.
+ outerOnRender = undefined;
+ onRender = parentView._.onRender;
+ }
+ if ($.isArray(data) && !isLayout) {
+ // Create a view for the array, whose child views correspond to each data item. (Note: if key and parentView are passed in
+ // along with parent view, treat as insert -e.g. from view.addViews - so parentView is already the view item for array)
+ newView = swapContent
+ ? parentView :
+ (key !== undefined && parentView) || View(context, "array", parentView, data, tmpl, key, contentTmpl, onRender);
+ for (i = 0, l = data.length; i < l; i++) {
+ // Create a view for each data item.
+ dataItem = data[i];
+ childView = View(context, "item", newView, dataItem, tmpl, (key || 0) + i, contentTmpl, onRender);
+ itemResult = tmpl.fn(dataItem, childView, $views);
+ result += newView._.onRender ? newView._.onRender(itemResult, childView) : itemResult;
+ }
+ } else {
+ // Create a view for singleton data object. The type of the view will be the tag name, e.g. "if" or "myTag" except for
+ // "item", "array" and "data" views. A "data" view is from programatic render(object) against a 'singleton'.
+ newView = swapContent ? parentView : View(context, tmplName||"data", parentView, data, tmpl, key, contentTmpl, onRender);
+ if (tag_ && !self.flow) {
+ newView.tag = self;
+ }
+ result += tmpl.fn(data, newView, $views);
+ }
+ return outerOnRender ? outerOnRender(result, newView) : result;
+ }
+ }
+ return "";
+ }
+
+ //===========================
+ // Build and compile template
+ //===========================
+
+ // Generate a reusable function that will serve to render a template against data
+ // (Compile AST then build template function)
+
+ function error(message) {
+ if ($viewsSettings.debugMode) {
+ throw new $views.sub.Error(message);
+ }
+ }
+
+ function syntaxError(message) {
+ error("Syntax error\n" + message);
+ }
+
+ function tmplFn(markup, tmpl, isLinkExpr, convertBack) {
+ // Compile markup to AST (abtract syntax tree) then build the template function code from the AST nodes
+ // Used for compiling templates, and also by JsViews to build functions for data link expressions
+
+
+ //==== nested functions ====
+ function pushprecedingContent(shift) {
+ shift -= loc;
+ if (shift) {
+ content.push(markup.substr(loc, shift).replace(rNewLine, "\\n"));
+ }
+ }
+
+ function blockTagCheck(tagName) {
+ tagName && syntaxError('Unmatched or missing tag: "{{/' + tagName + '}}" in template:\n' + markup);
+ }
+
+ function parseTag(all, bind, tagName, converter, colon, html, comment, codeTag, params, slash, closeBlock, index) {
+
+ // bind tag converter colon html comment code params slash closeBlock
+ // /{(\^)?{(?:(?:(\w+(?=[\/\s}]))|(?:(\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\*)))\s*((?:[^}]|}(?!}))*?)(\/)?|(?:\/(\w+)))}}/g
+ // Build abstract syntax tree (AST): [ tagName, converter, params, content, hash, bindings, contentMarkup ]
+ if (html) {
+ colon = ":";
+ converter = "html";
+ }
+ slash = slash || isLinkExpr;
+ var noError, current0,
+ pathBindings = bind && [],
+ code = "",
+ hash = "",
+ passedCtx = "",
+ // Block tag if not self-closing and not {{:}} or {{>}} (special case) and not a data-link expression
+ block = !slash && !colon && !comment;
+
+ //==== nested helper function ====
+ tagName = tagName || colon;
+ pushprecedingContent(index);
+ loc = index + all.length; // location marker - parsed up to here
+ if (codeTag) {
+ if (allowCode) {
+ content.push(["*", "\n" + params.replace(rUnescapeQuotes, "$1") + "\n"]);
+ }
+ } else if (tagName) {
+ if (tagName === "else") {
+ if (rTestElseIf.test(params)) {
+ syntaxError('for "{{else if expr}}" use "{{else expr}}"');
+ }
+ pathBindings = current[6];
+ current[7] = markup.substring(current[7], index); // contentMarkup for block tag
+ current = stack.pop();
+ content = current[3];
+ block = true;
+ }
+ if (params) {
+ // remove newlines from the params string, to avoid compiled code errors for unterminated strings
+ params = params.replace(rNewLine, " ");
+ code = parseParams(params, pathBindings)
+ .replace(rBuildHash, function(all, isCtx, keyValue) {
+ if (isCtx) {
+ passedCtx += keyValue + ",";
+ } else {
+ hash += keyValue + ",";
+ }
+ return "";
+ });
+ }
+ hash = hash.slice(0, -1);
+ code = code.slice(0, -1);
+ noError = hash && (hash.indexOf("noerror:true") + 1) && hash || "";
+
+ newNode = [
+ tagName,
+ converter || !!convertBack || "",
+ code,
+ block && [],
+ 'params:"' + params + '",props:{' + hash + "}"
+ + (passedCtx ? ",ctx:{" + passedCtx.slice(0, -1) + "}" : ""),
+ noError,
+ pathBindings || 0
+ ];
+ content.push(newNode);
+ if (block) {
+ stack.push(current);
+ current = newNode;
+ current[7] = loc; // Store current location of open tag, to be able to add contentMarkup when we reach closing tag
+ }
+ } else if (closeBlock) {
+ current0 = current[0];
+ blockTagCheck(closeBlock !== current0 && current0 !== "else" && closeBlock);
+ current[7] = markup.substring(current[7], index); // contentMarkup for block tag
+ current = stack.pop();
+ }
+ blockTagCheck(!current && closeBlock);
+ content = current[3];
+ }
+ //==== /end of nested functions ====
+
+ var newNode,
+ allowCode = tmpl && tmpl.allowCode,
+ astTop = [],
+ loc = 0,
+ stack = [],
+ content = astTop,
+ current = [, , , astTop];
+
+ markup = markup.replace(rEscapeQuotes, "\\$1");
+
+//TODO result = tmplFnsCache[markup]; // Only cache if template is not named and markup length < ...,
+//and there are no bindings or subtemplates?? Consider standard optimization for data-link="a.b.c"
+// if (result) {
+// tmpl.fn = result;
+// } else {
+
+// result = markup;
+
+ blockTagCheck(stack[0] && stack[0][3].pop()[0]);
+
+ // Build the AST (abstract syntax tree) under astTop
+ markup.replace(rTag, parseTag);
+
+ pushprecedingContent(markup.length);
+
+ if (loc = astTop[astTop.length - 1]) {
+ blockTagCheck("" + loc !== loc && (+loc[7] === loc[7]) && loc[0]);
+ }
+// result = tmplFnsCache[markup] = buildCode(astTop, tmpl);
+// }
+ return buildCode(astTop, tmpl || markup, isLinkExpr);
+ }
+
+ function buildCode(ast, tmpl, isLinkExpr) {
+ // Build the template function code from the AST nodes, and set as property on the passed-in template object
+ // Used for compiling templates, and also by JsViews to build functions for data link expressions
+ var i, node, tagName, converter, params, hash, hasTag, hasEncoder, getsVal, hasCnvt, tmplBindings, pathBindings, elseStartIndex, elseIndex,
+ nestedTmpls, tmplName, nestedTmpl, tagAndElses, allowCode, content, markup, notElse, nextIsElse, oldCode, isElse, isGetVal, prm, tagCtxFn,
+ tmplBindingKey = 0,
+ code = "",
+ noError = "",
+ tmplOptions = {},
+ l = ast.length;
+
+ if ("" + tmpl === tmpl) {
+ tmplName = isLinkExpr ? 'data-link="' + tmpl.replace(rNewLine, " ").slice(1, -1) + '"' : tmpl;
+ tmpl = 0;
+ } else {
+ tmplName = tmpl.tmplName || "unnamed";
+ if (allowCode = tmpl.allowCode) {
+ tmplOptions.allowCode = true;
+ }
+ if (tmpl.debug) {
+ tmplOptions.debug = true;
+ }
+ tmplBindings = tmpl.bnds;
+ nestedTmpls = tmpl.tmpls;
+ }
+ for (i = 0; i < l; i++) {
+ // AST nodes: [ tagName, converter, params, content, hash, noError, pathBindings, contentMarkup, link ]
+ node = ast[i];
+
+ // Add newline for each callout to t() c() etc. and each markup string
+ if ("" + node === node) {
+ // a markup string to be inserted
+ code += '\nret+="' + node + '";';
+ } else {
+ // a compiled tag expression to be inserted
+ tagName = node[0];
+ if (tagName === "*") {
+ // Code tag: {{* }}
+ code += "" + node[1];
+ } else {
+ converter = node[1];
+ params = node[2];
+ content = node[3];
+ hash = node[4];
+ noError = node[5];
+ markup = node[7];
+
+ if (!(isElse = tagName === "else")) {
+ tmplBindingKey = 0;
+ if (pathBindings = node[6]) { // Array of paths, or false if not data-bound
+ tmplBindingKey = tmplBindings.push(pathBindings);
+ }
+ }
+ if (isGetVal = tagName === ":") {
+ if (converter) {
+ tagName = converter === "html" ? ">" : converter + tagName;
+ }
+ if (noError) {
+ // If the tag includes noerror=true, we will do a try catch around expressions for named or unnamed parameters
+ // passed to the tag, and return the empty string for each expression if it throws during evaluation
+ //TODO This does not work for general case - supporting noError on multiple expressions, e.g. tag args and properties.
+ //Consider replacing with try<a.b.c(p,q) + a.d, xxx> and return the value of the expression a.b.c(p,q) + a.d, or, if it throws, return xxx||'' (rather than always the empty string)
+ prm = "prm" + i;
+ noError = "try{var " + prm + "=[" + params + "][0];}catch(e){" + prm + '="";}\n';
+ params = prm;
+ }
+ } else {
+ if (content) {
+ // Create template object for nested template
+ nestedTmpl = TmplObject(markup, tmplOptions);
+ nestedTmpl.tmplName = tmplName + "/" + tagName;
+ // Compile to AST and then to compiled function
+ buildCode(content, nestedTmpl);
+ nestedTmpls.push(nestedTmpl);
+ }
+
+ if (!isElse) {
+ // This is not an else tag.
+ tagAndElses = tagName;
+ // Switch to a new code string for this bound tag (and its elses, if it has any) - for returning the tagCtxs array
+ oldCode = code;
+ code = "";
+ elseStartIndex = i;
+ }
+ nextIsElse = ast[i + 1];
+ nextIsElse = nextIsElse && nextIsElse[0] === "else";
+ }
+
+//TODO consider passing in ret to c() and t() so they can look at the previous ret, and detect whether this is a jsrender tag _within_an_HTML_element_tag_
+// and if so, don't insert marker nodes, add data-link attributes to the HTML element markup... No need for people to set link=false.
+
+//TODO consider the following approach rather than noerror=true: params.replace(/data.try\([^]*\)/)
+
+ hash += ",args:[" + params + "]}";
+
+ if (isGetVal && pathBindings || converter && tagName !== ">") {
+ // For convertVal we need a compiled function to return the new tagCtx(s)
+ tagCtxFn = new Function("data,view,j,u", " // "
+ + tmplName + " " + tmplBindingKey + " " + tagName + "\n" + noError + "return {" + hash + ";");
+ tagCtxFn.paths = pathBindings;
+ tagCtxFn._ctxs = tagName;
+ if (isLinkExpr) {
+ return tagCtxFn;
+ }
+ hasCnvt = true;
+ }
+
+ code += (isGetVal
+ ? "\n" + (pathBindings ? "" : noError) + (isLinkExpr ? "return " : "ret+=") + (hasCnvt // Call _cnvt if there is a converter: {{cnvt: ... }} or {^{cnvt: ... }}
+ ? (hasCnvt = true, 'c("' + converter + '",view,' + (pathBindings
+ ? ((tmplBindings[tmplBindingKey - 1] = tagCtxFn), tmplBindingKey) // Store the compiled tagCtxFn in tmpl.bnds, and pass the key to convertVal()
+ : "{" + hash) + ");")
+ : tagName === ">"
+ ? (hasEncoder = true, "h(" + params + ");")
+ : (getsVal = true, "(v=" + params + ")!=" + (isLinkExpr ? "=" : "") + 'u?v:"";') // Strict equality just for data-link="title{:expr}" so expr=null will remove title attribute
+ )
+ : (hasTag = true, "{tmpl:" // Add this tagCtx to the compiled code for the tagCtxs to be passed to renderTag()
+ + (content ? nestedTmpls.length: "0") + "," // For block tags, pass in the key (nestedTmpls.length) to the nested content template
+ + hash + ","));
+
+ if (tagAndElses && !nextIsElse) {
+ code = "[" + code.slice(0, -1) + "]"; // This is a data-link expression or the last {{else}} of an inline bound tag. We complete the code for returning the tagCtxs array
+ if (isLinkExpr || pathBindings) {
+ // This is a bound tag (data-link expression or inline bound tag {^{tag ...}}) so we store a compiled tagCtxs function in tmp.bnds
+ code = new Function("data,view,j,u", " // " + tmplName + " " + tmplBindingKey + " " + tagAndElses + "\nreturn " + code + ";");
+ if (pathBindings) {
+ (tmplBindings[tmplBindingKey - 1] = code).paths = pathBindings;
+ }
+ code._ctxs = tagName;
+ if (isLinkExpr) {
+ return code; // For a data-link expression we return the compiled tagCtxs function
+ }
+ }
+
+ // This is the last {{else}} for an inline tag.
+ // For a bound tag, pass the tagCtxs fn lookup key to renderTag.
+ // For an unbound tag, include the code directly for evaluating tagCtxs array
+ code = oldCode + '\nret+=t("' + tagAndElses + '",view,this,' + (tmplBindingKey || code) + ");";
+ pathBindings = 0;
+ tagAndElses = 0;
+ }
+ }
+ }
+ }
+ // Include only the var references that are needed in the code
+ code = "// " + tmplName
+ + "\nvar j=j||" + (jQuery ? "jQuery." : "js") + "views"
+ + (getsVal ? ",v" : "") // gets value
+ + (hasTag ? ",t=j._tag" : "") // has tag
+ + (hasCnvt ? ",c=j._cnvt" : "") // converter
+ + (hasEncoder ? ",h=j.converters.html" : "") // html converter
+ + (isLinkExpr ? ";\n" : ',ret="";\n')
+ + ($viewsSettings.tryCatch ? "try{\n" : "")
+ + (tmplOptions.debug ? "debugger;" : "")
+ + code + (isLinkExpr ? "\n" : "\nreturn ret;\n")
+ + ($viewsSettings.tryCatch ? "\n}catch(e){return j._err(e);}" : "");
+ try {
+ code = new Function("data,view,j,u", code);
+ } catch (e) {
+ syntaxError("Compiled template code:\n\n" + code, e);
+ }
+ if (tmpl) {
+ tmpl.fn = code;
+ }
+ return code;
+ }
+
+ function parseParams(params, bindings) {
+
+ function parseTokens(all, lftPrn0, lftPrn, path, operator, err, eq, path2, prn, comma, lftPrn2, apos, quot, rtPrn, rtPrnDot, prn2, space, index, full) {
+ // rParams = /(\()(?=\s*\()|(?:([([])\s*)?(?:([#~]?[\w$^.]+)?\s*((\+\+|--)|\+|-|&&|\|\||===|!==|==|!=|<=|>=|[<>%*!:?\/]|(=))\s*|([#~]?[\w$^.]+)([([])?)|(,\s*)|(\(?)\\?(?:(')|("))|(?:\s*([)\]])([([]?))|(\s+)
+ // lftPrn0-flwed by (- lftPrn path operator err eq path2 prn comma lftPrn2 apos quot rtPrn prn2 space
+ // (left paren? followed by (path? followed by operator) or (path followed by paren?)) or comma or apos or quot or right paren or space
+ operator = operator || "";
+ lftPrn = lftPrn || lftPrn0 || lftPrn2;
+ path = path || path2;
+ if (bindings && rtPrnDot) {
+ // TODO check for nested call ~foo(~bar().x).y
+ objectCall = bindings.push({_jsvOb: full.slice(pathStart[parenDepth - 1] + 1, index + 1)});
+ }
+ prn = prn || prn2 || "";
+
+ function parsePath(all, object, helper, view, viewProperty, pathTokens, leafToken) {
+ // rPath = /^(?:null|true|false|\d[\d.]*|([\w$]+|~([\w$]+)|#(view|([\w$]+))?)([\w$.^]*?)(?:[.[^]([\w$]+)\]?)?)$/g,
+ // object helper view viewProperty pathTokens leafToken
+ if (object) {
+ bindings && !name && bindings.push(path); // Add path binding for paths on props and args, but not within ~foo=expr (passing in template property aliases).
+ if (object !== ".") {
+ var ret = (helper
+ ? 'view.hlp("' + helper + '")'
+ : view
+ ? "view"
+ : "data")
+ + (leafToken
+ ? (viewProperty
+ ? "." + viewProperty
+ : helper
+ ? ""
+ : (view ? "" : "." + object)
+ ) + (pathTokens || "")
+ : (leafToken = helper ? "" : view ? viewProperty || "" : object, ""));
+
+ ret = ret + (leafToken ? "." + leafToken : "");
+
+ return ret.slice(0, 9) === "view.data"
+ ? ret.slice(5) // convert #view.data... to data...
+ : ret;
+ }
+ }
+ return all;
+ }
+
+ if (err) {
+ syntaxError(params);
+ } else {
+ var tokens = (aposed
+ // within single-quoted string
+ ? (aposed = !apos, (aposed ? all : '"'))
+ : quoted
+ // within double-quoted string
+ ? (quoted = !quot, (quoted ? all : '"'))
+ :
+ (
+ (lftPrn
+ ? (parenDepth++, pathStart[parenDepth] = index, lftPrn)
+ : "")
+ + (space
+ ? (parenDepth
+ ? ""
+ : named
+ ? (named = false, "\b")
+ : ","
+ )
+ : eq
+ // named param
+ // Insert backspace \b (\x08) as separator for named params, used subsequently by rBuildHash
+ ? (parenDepth && syntaxError(params), named = path, '\b' + path + ':')
+ : path
+ // path
+ ? (path.split("^").join(".").replace(rPath, parsePath)
+ + (prn
+ ? (fnCall[++parenDepth] = true, prn)
+ : operator)
+ )
+ : operator
+ ? operator
+ : rtPrn
+ // function
+ ? ((fnCall[parenDepth--] = false, rtPrn)
+ + (prn
+ ? (fnCall[++parenDepth] = true, prn)
+ : "")
+ )
+ : comma
+ ? (fnCall[parenDepth] || syntaxError(params), ",") // We don't allow top-level literal arrays or objects
+ : lftPrn0
+ ? ""
+ : (aposed = apos, quoted = quot, '"')
+ ))
+ );
+ return tokens;
+ }
+ }
+
+ var named, objectCall,
+ fnCall = {},
+ pathStart = {0:-1},
+ parenDepth = 0,
+ quoted = false, // boolean for string content in double quotes
+ aposed = false; // or in single quotes
+
+ return (params + " ").replace(rParams, parseTokens);
+ }
+
+ //==========
+ // Utilities
+ //==========
+
+ // Merge objects, in particular contexts which inherit from parent contexts
+ function extendCtx(context, parentContext) {
+ // Return copy of parentContext, unless context is defined and is different, in which case return a new merged context
+ // If neither context nor parentContext are undefined, return undefined
+ return context && context !== parentContext
+ ? (parentContext
+ ? $extend($extend({}, parentContext), context)
+ : context)
+ : parentContext && $extend({}, parentContext);
+ }
+
+ //========================== Initialize ==========================
+
+ for (jsvStoreName in jsvStores) {
+ registerStore(jsvStoreName, jsvStores[jsvStoreName]);
+ }
+
+ var $templates = $views.templates,
+ $converters = $views.converters,
+ $helpers = $views.helpers,
+ $tags = $views.tags,
+ $viewsSub = $views.sub,
+ $viewsSettings = $views.settings;
+
+ if (jQuery) {
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // jQuery is loaded, so make $ the jQuery object
+ $ = jQuery;
+ $.render = $render;
+ $.views = $views;
+ $.templates = $templates = $views.templates;
+ $.fn.render = renderContent;
+
+ } else {
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // jQuery is not loaded.
+
+ $ = global.jsviews = $views;
+
+ $.isArray = Array && Array.isArray || function(obj) {
+ return Object.prototype.toString.call(obj) === "[object Array]";
+ };
+ }
+
+ //========================== Register tags ==========================
+
+ $tags({
+ "else": function() {}, // Does nothing but ensures {{else}} tags are recognized as valid
+ "if": {
+ render: function(val) {
+ // This function is called once for {{if}} and once for each {{else}}.
+ // We will use the tag.rendering object for carrying rendering state across the calls.
+ // If not done (a previous block has not been rendered), look at expression for this block and render the block if expression is truey
+ // Otherwise return ""
+ var self = this,
+ ret = (self.rendering.done || !val && (arguments.length || !self.tagCtx.index))
+ ? ""
+ : (self.rendering.done = true, self.selected = self.tagCtx.index,
+ // Test is satisfied, so render content on current context. We call tagCtx.render() rather than return undefined
+ // (which would also render the tmpl/content on the current context but would iterate if it is an array)
+ self.tagCtx.render());
+ return ret;
+ },
+ onUpdate: function(ev, eventArgs, tagCtxs) {
+ var tci, prevArg, different;
+ for (tci = 0; (prevArg = this.tagCtxs[tci]) && prevArg.args.length; tci++) {
+ prevArg = prevArg.args[0];
+ different = !prevArg !== !tagCtxs[tci].args[0];
+ if (!!prevArg || different) {
+ return different;
+ // If newArg and prevArg are both truey, return false to cancel update. (Even if values on later elses are different, we still don't want to update, since rendered output would be unchanged)
+ // If newArg and prevArg are different, return true, to update
+ // If newArg and prevArg are both falsey, move to the next {{else ...}}
+ }
+ }
+ // Boolean value of all args are unchanged (falsey), so return false to cancel update
+ return false;
+ },
+ flow: true
+ },
+ "for": {
+ render: function(val) {
+ // This function is called once for {{for}} and once for each {{else}}.
+ // We will use the tag.rendering object for carrying rendering state across the calls.
+ var i, arg,
+ self = this,
+ tagCtx = self.tagCtx,
+ noArg = !arguments.length,
+ result = "",
+ done = noArg || 0;
+
+ if (!self.rendering.done) {
+ if (noArg) {
+ result = undefined;
+ } else if (val !== undefined) {
+ result += tagCtx.render(val);
+ // {{for}} (or {{else}}) with no argument will render the block content
+ done += $.isArray(val) ? val.length : 1;
+ }
+ if (self.rendering.done = done) {
+ self.selected = tagCtx.index;
+ }
+ // If nothing was rendered we will look at the next {{else}}. Otherwise, we are done.
+ }
+ return result;
+ },
+ onUpdate: function(ev, eventArgs, tagCtxs) {
+ //Consider adding filtering for perf optimization. However the below prevents update on some scenarios which _should_ update - namely when there is another array on which for also depends.
+ //var i, l, tci, prevArg;
+ //for (tci = 0; (prevArg = this.tagCtxs[tci]) && prevArg.args.length; tci++) {
+ // if (prevArg.args[0] !== tagCtxs[tci].args[0]) {
+ // return true;
+ // }
+ //}
+ //return false;
+ },
+ onArrayChange: function(ev, eventArgs) {
+ var arrayView,
+ self = this,
+ change = eventArgs.change;
+ if (this.tagCtxs[1] && (
+ change === "insert" && ev.target.length === eventArgs.items.length // inserting, and new length is same as inserted length, so going from 0 to n
+ || change === "remove" && !ev.target.length // removing , and new length 0, so going from n to 0
+ || change === "refresh" && !eventArgs.oldItems.length !== !ev.target.length // refreshing, and length is going from 0 to n or from n to 0
+ )) {
+ this.refresh();
+ } else {
+ for (arrayView in self._.arrVws) {
+ arrayView = self._.arrVws[arrayView];
+ if (arrayView.data === ev.target) {
+ arrayView._.onArrayChange.apply(arrayView, arguments);
+ }
+ }
+ }
+ ev.done = true;
+ },
+ flow: true
+ },
+ include: {
+ flow: true
+ },
+ "*": {
+ // {{* code... }} - Ignored if template.allowCode is false. Otherwise include code in compiled template
+ render: function(value) {
+ return value; // Include the code.
+ },
+ flow: true
+ }
+ });
+
+ //========================== Register global helpers ==========================
+
+ // $helpers({ // Global helper functions
+ // // TODO add any useful built-in helper functions
+ // });
+
+ //========================== Register converters ==========================
+
+ // Get character entity for HTML and Attribute encoding
+ function getCharEntity(ch) {
+ return charEntities[ch];
+ }
+
+ $converters({
+ html: function(text) {
+ // HTML encode: Replace < > & and ' and " by corresponding entities.
+ return text != undefined ? String(text).replace(rHtmlEncode, getCharEntity) : "";
+ },
+ attr: function(text) {
+ // Attribute encode: Replace < & ' and " by corresponding entities.
+ return text != undefined ? String(text).replace(rAttrEncode, getCharEntity) : "";
+ },
+ url: function(text) {
+ // TODO - support chaining {{attr|url:....}} to protect against injection attacks from url parameters containing " or '.
+ // URL encoding helper.
+ return text != undefined ? encodeURI(String(text)) : "";
+ }
+ });
+
+ //========================== Define default delimiters ==========================
+ $viewsDelimiters();
+
+})(this, this.jQuery);
View
4 AddCon_TravellingSalesman/Spec/GeoOffice_Route.html
@@ -25,7 +25,7 @@
<script src="../Scripts/tutScript.js"></script>
<script src="../Scripts/App/geo.js"></script>
<script src="../Scripts/App/app.js"></script>
- <script src="../Test/common.js"></script>
- <script src="../Test/GeoOffice.js"></script>
+ <script src="../Scripts/App/common.js"></script>
+ <script src="../Test/GeoOffice_Route.js"></script>
</body>
</html>
View
65 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_android_4.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html class="tut">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Nearest Salesman Test</title>
+<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />-->
+<link rel="stylesheet" href="../Content/qunit-1.11.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile-1.1.0.css">
+<link rel="stylesheet" href="../Content/jquery.mobile.acTravelSales.css">
+<link rel="stylesheet" href="../Content/oocss_core/core.css">
+<link rel="stylesheet" href="../Content/oocss_core/content.css">
+<link rel="stylesheet" href="../Content/oocss_core/libraries.css">
+<link rel="stylesheet" href="../Content/oocss_core/template/template.css">
+<link rel="stylesheet" href="../Content/app.css"> <!-- for e.g. puttMat -->
+</head>
+<body>
+ <div data-role="page" data-theme="a" id="salesmanTravelling">
+ <div id="qunit"></div>
+ <div id="qunit-fixture" class="nomaps">
+ <div>
+ </div>
+ </div>
+ <div>
+ <article id="map" class="maps info-box" style=" float:left">
+ <div></div>
+ </article>
+ <article id="route" class="mapsRoute info-box" style=" float:right">
+ <div></div>
+ </article>
+ </div>
+ <div data-role="content">
+ <div class="header">
+ <div id="puttMat">
+ <ul id="puttMatList">
+ </ul>
+ </div>
+ </div>
+ <div class="main">
+ <h2>Main</h2>
+ <div id="salesmanList" data-enhance="true"></div>
+ </div>
+ </div>
+ </div>
+ <script id="pagePuttTemplate" type="text/x-jsrender">
+ {{for List}}
+ <li>
+ <a href="#">
+ <img src="../Content/images/puttPlug.png" />
+ </a>
+ </li>
+ {{/for}}
+ </script>
+ <script src="../Scripts/jquery-1.8.2.js"></script>
+ <script src="../Scripts/jsrender.js"></script>
+ <script src="../Scripts/qunit-1.11.0.js"></script>
+ <script src="../Scripts/tutScript.js"></script>
+ <!--<script src="../Scripts/App/geo.js"></script>-->
+ <script src="../Test/commonTest.js"></script>
+ <script src="../Scripts/App/config.js"></script>
+ <script src="../Scripts/App/app.js"></script>
+ <script src="../Scripts/App/common.js"></script>
+ <script src="../Test/GeoOffice_xyz_android_4.js"></script>
+ <script src="../Scripts/jquery.mobile-1.1.0.js"></script>
+</body>
+</html>
View
17 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_iPad_iOS4.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" href="../Content/oocss_core/content.css">
<link rel="stylesheet" href="../Content/oocss_core/libraries.css">
<link rel="stylesheet" href="../Content/oocss_core/template/template.css">
+<link rel="stylesheet" href="../Content/app.css"> <!-- for e.g. puttMat -->
</head>
<body>
<div data-role="page" data-theme="a" id="salesmanTravelling">
@@ -28,13 +29,29 @@
</article>
</div>
<div data-role="content">
+ <div class="header">
+ <div id="puttMat">
+ <ul id="puttMatList">
+ </ul>
+ </div>
+ </div>
<div class="main">
<h2>Main</h2>
<div id="salesmanList" data-enhance="true"></div>
</div>
</div>
</div>
+ <script id="pagePuttTemplate" type="text/x-jsrender">
+ {{for List}}
+ <li>
+ <a href="#">
+ <img src="../Content/images/puttPlug.png" />
+ </a>
+ </li>
+ {{/for}}
+ </script>
<script src="../Scripts/jquery-1.8.2.js"></script>
+ <script src="../Scripts/jsrender.js"></script>
<script src="../Scripts/qunit-1.11.0.js"></script>
<script src="../Scripts/tutScript.js"></script>
<!--<script src="../Scripts/App/geo.js"></script>-->
View
17 AddCon_TravellingSalesman/Spec/GeoOffice_xyz_iPhone_iOS4.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" href="../Content/oocss_core/content.css">
<link rel="stylesheet" href="../Content/oocss_core/libraries.css">
<link rel="stylesheet" href="../Content/oocss_core/template/template.css">
+<link rel="stylesheet" href="../Content/app.css"> <!-- for e.g. puttMat -->
</head>
<body>
<div data-role="page" data-theme="a" id="salesmanTravelling">
@@ -28,13 +29,29 @@
</article>
</div>
<div data-role="content">
+ <div class="header">
+ <div id="puttMat">
+ <ul id="puttMatList">
+ </ul>
+ </div>
+ </div>
<div class="main">
<h2>Main</h2>
<div id="salesmanList" data-enhance="true"></div>
</div>
</div>
</div>
+ <script id="pagePuttTemplate" type="text/x-jsrender">
+ {{for List}}
+ <li>
+ <a href="#">
+ <img src="../Content/images/puttPlug.png" />
+ </a>
+ </li>
+ {{/for}}
+ </script>
<script src="../Scripts/jquery-1.8.2.js"></script>
+ <script src="../Scripts/jsrender.js"></script>
<script src="../Scripts/qunit-1.11.0.js"></script>
<script src="../Scripts/tutScript.js"></script>
<!--<script src="../Scripts/App/geo.js"></script>-->
View
76 AddCon_TravellingSalesman/Test/GeoOffice_xyz_android_4.js
@@ -0,0 +1,76 @@
+module("GeoOffice on an Android", {
+});
+
+// CSS Tests - assume userAgent is chrome iOS 4.0 with dimensions 320 x 480
+
+function sequenceSalesmanCSSSuccess(data, textStatus, jqXHR) {
+ debugger;
+ $("#salesmanList").html(jqXHR.responseText).trigger("create");
+ ok(navigator.userAgent.toLowerCase().indexOf("android") >= 0, "Android browser confirmed");
+ ok(screen.width === 320, "Galaxy S Duos mimicked screen width is 320 as required");
+ ok(screen.width === $(document).width(), "Galaxy S Duos mimicked document width is good - no horizontal scrollbars");
+ ok(screen.height === 480, "Galaxy S Duos mimicked height is 480 as required");
+ ok($("div.size1of3").last().width() === 290, "Galaxy S Duos mimicked width of first list is 290 as required");
+ ok($("div.size1of3").last().width() === 290, "Galaxy S Duos mimicked width of last list is 290 as required");
+ start();
+}
+
+function sequenceSalesmanCSSError(jqXHR, testStatus, errorThrown) {
+
+}
+
+asyncTest("As already discussed iPhone document and device dimensions should match i.e. no scrollbars", function () {
+ debugger;
+ app.getUserCoordinates({ errorFlag: false }, geoTestCSSCBSequenceSalesmanSuccess, geoTestCSSCBSequenceSalesmanError);
+})
+
+test("As already discussed List widths should be less than the width of the iPhone", function () {
+ debugger;
+ ok($(".unit.size1of3.lastUnit").width() <= screen.width, "Success");
+})
+
+test("As already discussed List elements should have brown background", function () {
+ debugger;
+ ok(true === false, "Background colour looking good :-)");
+})
+
+test("As already discussed List element highlight should be orange", function () {
+ debugger;
+ ok(true === false, "List element highlight looking good :-)");
+})
+
+// Behaviour Tests
+test("As already discussed flicking to left or right should show salesman by distance, product and industry", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed rotating to landscape should show location by distance, product and industry", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed rotating from portrait should show salesman in terms of distance, product and industry", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed tapping salesman should show details by distance, product and industry", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed holding unselected salesman should fix him in the list when scrolling", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed holding selected salesman should unfix him in the list when scrolling", function () {
+ ok(true === true, "Success");
+})
+
+module("GeoOffice on a iPad", {
+});
+
+test("As already discussed salesman list should show columns for distance, product and industry", function () {
+ ok(true === true, "Success");
+})
+
+test("As already discussed salesman list should show bigger version of ipad", function () {
+ ok(true === true, "Success");
+})
View
55 AddCon_TravellingSalesman/Test/GeoOffice_xyz_iPad_iOS4.js
@@ -1,4 +1,4 @@
-module("GeoOffice on a iPhone", {
+module("GeoOffice on a iPad", {
});
// CSS Tests - assume userAgent is chrome iOS 4.0 with dimensions 320 x 480
@@ -6,11 +6,12 @@
function sequenceSalesmanCSSSuccess(data, textStatus, jqXHR) {
debugger;
$("#salesmanList").html(jqXHR.responseText).trigger("create");
- ok(screen.width === 768, "iPhone mimicked screen width is 768 as required");
- ok(screen.width === $(document).width(), "iPhone mimicked document width is good - no horizontal scrollbars");
- ok(screen.height === 1024, "iPhone mimicked screen height is 1024 as required");
- ok($("div.size1of3").first().width() === 290, "iPhone mimicked width of first list is 290 as required");
- ok($("div.size1of3").last().width() === 738, "iPhone mimicked width of last list is 738 as required");
+ ok(navigator.userAgent.toLowerCase().indexOf("ipad") >= 0, "iPad browser confirmed");
+ ok(screen.width === 768, "iPad mimicked screen width is 768 as required");
+ ok(screen.width === $(document).width(), "iPad mimicked document width is good - no horizontal scrollbars");
+ ok(screen.height === 1024, "iPad mimicked screen height is 1024 as required");
+ ok($("div.size1of3").first().width() === 290, "iPad mimicked width of first list is 290 as required");
+ ok($("div.size1of3").last().width() === 738, "iPad mimicked width of last list is 738 as required");
start();
}
@@ -73,3 +74,45 @@ test("As already discussed salesman list should show columns for distance, produ
test("As already discussed salesman list should show bigger version of ipad", function () {
ok(true === true, "Success");
})
+
+module("GeoOffice on a iPad: flicking to left or right should show salesman by distance, product, industry, distance, product (5 column grid)", {
+});
+
+asyncTest("As already discussed iPhone document and device dimensions should match i.e. no scrollbars", function () {
+ // Ajax call responsible for getting the salesman data
+ // Called a second time because ajax call is module dependant.
+ //debugger;
+ app.getUserCoordinates({ errorFlag: false }, geoTestCSSCBSequenceSalesmanSuccess, geoTestCSSCBSequenceSalesmanError);
+})
+
+test("As already discussed selecting hole 2 should show columns side by side", function () {
+ if ($(".size1of5").length > 0) {
+ var numPages = app.primePuttMat();
+ app.scorePuttMatRows();
+ if (numPages > 1) {
+ //debugger;
+ var secondHole = 1;
+ $("#puttMat a:eq(" + secondHole + ")").trigger("click"); // Simulate tapping second hole
+ var leftStackedColCount = 0;
+ var lastOffsetLeft = new Array(); // Ich bin here
+ $.each($(".activePage"), function (index, ele) {
+ debugger;
+ var offsetLeft = $(ele).offset().left;
+ if (lastOffsetLeft.indexOf(offsetLeft) >= 0) {
+ leftStackedColCount = leftStackedColCount + 1;
+ }
+ else {
+ lastOffsetLeft.push(offsetLeft);
+ }
+ });
+ ok(leftStackedColCount <= 1, "Columns showing on page 2 selection");
+ }
+ else {
+ expect(0);
+ }
+ }
+ else {
+ expect(0);
+ }
+
+});
View
91 AddCon_TravellingSalesman/Test/GeoOffice_xyz_iPhone_iOS4.js
@@ -1,11 +1,12 @@
-module("GeoOffice on a iPhone", {
+module("GeoOffice on a iPhone: multi-device", {
});
// CSS Tests - assume userAgent is chrome iOS 4.0 with dimensions 320 x 480
function sequenceSalesmanCSSSuccess(data, textStatus, jqXHR) {
- debugger;
+ //debugger;
$("#salesmanList").html(jqXHR.responseText).trigger("create");
+ ok(navigator.userAgent.toLowerCase().indexOf("iphone") >= 0, "iPhone browser confirmed");
ok(screen.width === 320, "iPhone mimicked screen width is 320 as required");
ok(screen.width === $(document).width(), "iPhone mimicked document width is good - no horizontal scrollbars");
ok(screen.height === 480, "iPhone mimicked height is 480 as required");
@@ -19,57 +20,111 @@ function sequenceSalesmanCSSError(jqXHR, testStatus, errorThrown) {
}
asyncTest("As already discussed iPhone document and device dimensions should match i.e. no scrollbars", function () {
- debugger;
+ // Ajax call responsible for getting the salesman data
+ //debugger;
app.getUserCoordinates({ errorFlag: false }, geoTestCSSCBSequenceSalesmanSuccess, geoTestCSSCBSequenceSalesmanError);
})
test("As already discussed List widths should be less than the width of the iPhone", function () {
- debugger;
+ //debugger;
ok($(".unit.size1of3.lastUnit").width() <= screen.width, "Success");
-})
+});
test("As already discussed List elements should have brown background", function () {
- debugger;
+ //debugger;
ok(true === false, "Background colour looking good :-)");
-})
+});
test("As already discussed List element highlight should be orange", function () {
- debugger;
+ //debugger;
ok(true === false, "List element highlight looking good :-)");
+});
+
+module("GeoOffice on a iPhone: flicking to left or right should show salesman by distance, product and industry (3 column grid)", {
+});
+
+asyncTest("As already discussed iPhone document and device dimensions should match i.e. no scrollbars", function () {
+ // Ajax call responsible for getting the salesman data
+ // Called a second time because ajax call is module dependant.
+ //debugger;
+ app.getUserCoordinates({ errorFlag: false }, geoTestCSSCBSequenceSalesmanSuccess, geoTestCSSCBSequenceSalesmanError);
})
// Behaviour Tests
-test("As already discussed flicking to left or right should show salesman by distance, product and industry", function () {
- ok(true === true, "Success");
-})
+// Note the order in which these (independant) tests are done is not predictable
+test("As already discussed overview flick panel should show if columns are stacked", function () {
+ //debugger;
+ app.primePuttMat();
+ pagePuttCount();
+});
+
+
+test("As already discussed initial conditions should show 1st page tieing up with 1st puttHole", function () {
+ if ($(".size1of3").length > 0) {
+ var numPages = app.primePuttMat();
+ app.scorePuttMatRows();
+ //debugger;
+ app.teeOff();
+ ok($(".row0").length > 0, "Rows are marked with their page number");
+ ok($("#puttMat a:first").hasClass("ballInTheHole"), "Putt Mat´s leftmost hole filled");
+ ok($(".row0").hasClass("activePage") === true, "First Page showing");
+ if (numPages > 1) {
+ ok($(".row1").hasClass("inactivePage") === true, "Second Page not showing");
+ }
+ else {
+ expect(0);
+ }
+});
+
+test("As already discussed selecting hole 2 should show coresponding page", function () {
+ if ($(".size1of3").length > 0) {
+ var numPages = app.primePuttMat();
+ app.scorePuttMatRows();
+ if (numPages > 1) {
+ //debugger;
+ var secondHole = 1;
+ $("#puttMat a:eq(" + secondHole + ")").trigger("click"); // Simulate tapping second hole
+ ok($(".row1.activePage").length > 0, "Page 2 active");
+ ok($(".row0.inactivePage").length > 0, "Page 1 inactive");
+ ok($("#puttMat a:eq(" + secondHole + ")").hasClass("ballInTheHole") === true, "Putt Mat´s 2nd hole filled");
+ ok($("#puttMat a:first").hasClass("ballInTheHole") === false, "Putt Mat´s 1st hole empty");
+ }
+ else {
+ expect(0);
+ }
+ }
+ else {
+ expect(0);
+ }
+});
test("As already discussed rotating to landscape should show location by distance, product and industry", function () {
ok(true === true, "Success");
-})
+});
test("As already discussed rotating from portrait should show salesman in terms of distance, product and industry", function () {
ok(true === true, "Success");
-})
+});
test("As already discussed tapping salesman should show details by distance, product and industry", function () {
ok(true === true, "Success");
-})
+});
test("As already discussed holding unselected salesman should fix him in the list when scrolling", function () {
ok(true === true, "Success");
-})
+});
test("As already discussed holding selected salesman should unfix him in the list when scrolling", function () {
ok(true === true, "Success");
-})
+});
module("GeoOffice on a iPad", {
});
test("As already discussed salesman list should show columns for distance, product and industry", function () {
ok(true === true, "Success");
-})
+});
test("As already discussed salesman list should show bigger version of ipad", function () {
ok(true === true, "Success");
-})
+});
View
8 AddCon_TravellingSalesman/Test/commonTest.js
@@ -36,7 +36,7 @@ function geoTestCBSequenceSalesmanError() {
}
function geoTestCSSCBSequenceSalesmanSuccess(position) {
- debugger;
+ //debugger;
app.geoRankingCallbackSuccess(position);
ok(app.userHasLocation() === true, "User now has a location");
app.showNearestFirst(sequenceSalesmanCSSSuccess, sequenceSalesmanCSSError);
@@ -47,4 +47,8 @@ function geoTestCSSCBSequenceSalesmanError() {
start();
}
-
+function pagePuttCount() {
+ //debugger;
+ var numPages = app.getPageFlickCount();
+ ok($("#puttMatList li").length === numPages, "Success");
+}
View
3  AddCon_TravellingSalesman/Views/SalesmanModels/Index.cshtml
@@ -11,7 +11,8 @@