qol: update javascript bundling

Disco.Web/ClientSource/Scripts/Modules/Disco-ExpressionEditor.js

@@ -1,4 +1,4 @@
-/// <reference path="../../Core/jquery-1.7.1.js" />
+/// <reference path="../Core/jquery-2.1.1.js" />
 function DiscoExpressionEditor(host, validateUrl, expression) {
     this.host = host;
     this.hostDocument = null;

Disco.Web/ClientSource/Scripts/Modules/Disco-ExpressionEditor/disco.expressioneditor.js

@@ -1,4 +1,4 @@
-/// <reference path="../../Core/jquery-1.7.1.js" />
+/// <reference path="../../Core/jquery-2.1.1.js" />
 function DiscoExpressionEditor(host, validateUrl, expression) {
     this.host = host;
     this.hostDocument = null;

Disco.Web/ClientSource/Scripts/Modules/Disco-jQueryExtensions.js

@@ -1,4 +1,4 @@
-/// <reference path="../../Core/jquery-1.7.1.js" />
+/// <reference path="../Core/jquery-2.1.1.js" />
 (function ($) {
 
     var checkboxBulkSelectMethods = {

Disco.Web/ClientSource/Scripts/Modules/Disco-jQueryExtensions/disco.jQueryExtensions.js

@@ -1,4 +1,4 @@
-/// <reference path="../../Core/jquery-1.7.1.js" />
+/// <reference path="../../Core/jquery-2.1.1.js" />
 (function ($) {
 
     var checkboxBulkSelectMethods = {

Disco.Web/ClientSource/Scripts/Modules/Highcharts.js

@@ -17669,4 +17669,4 @@ extend(Highcharts, {
 	version: VERSION
 });
 
-}());
+}());

Disco.Web/ClientSource/Scripts/Modules/Knockout.js

@@ -93,4 +93,4 @@ l,g]));k.length=0;a.a.$(k,l)},null,{G:b,Da:function(){return!a.a.eb(k)}});return
 v,x=0,A,C;A=q[x];x++)switch(C=A.moved,A.status){case "deleted":C===p&&(v=r[t],v.h&&v.h.F(),w.push.apply(w,a.a.ea(v.S,d)),h.beforeRemove&&(e[x]=v,y.push(v)));t++;break;case "retained":k(x,t++);break;case "added":C!==p?k(x,C):(v={ka:A.value,Ia:a.m(u++)},s.push(v),y.push(v),n||(m[x]=v))}l(h.beforeMove,z);a.a.r(w,h.beforeRemove?a.M:a.removeNode);for(var x=0,n=a.e.firstChild(d),E;v=y[x];x++){v.S||a.a.extend(v,b(d,f,v.ka,g,v.Ia));for(t=0;q=v.S[t];n=q.nextSibling,E=q,t++)q!==n&&a.e.rb(d,q,E);!v.Zb&&g&&(g(v.ka,
 v.S,v.Ia),v.Zb=!0)}l(h.beforeRemove,e);l(h.afterMove,z);l(h.afterAdd,m);a.a.f.set(d,c,s)}})();a.b("utils.setDomNodeChildrenFromArrayMapping",a.a.Ua);a.K=function(){this.allowTemplateRewriting=!1};a.K.prototype=new a.C;a.K.prototype.renderTemplateSource=function(b){var c=(9>a.a.oa?0:b.nodes)?b.nodes():null;if(c)return a.a.R(c.cloneNode(!0).childNodes);b=b.text();return a.a.Qa(b)};a.K.Ja=new a.K;a.Wa(a.K.Ja);a.b("nativeTemplateEngine",a.K);(function(){a.La=function(){var a=this.ac=function(){if(!t||
 !t.tmpl)return 0;try{if(0<=t.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,e,f){f=f||{};if(2>a)throw Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.");var h=b.data("precompiled");h||(h=b.text()||"",h=t.template(null,"{{ko_with $item.koBindingContext}}"+h+"{{/ko_with}}"),b.data("precompiled",h));b=[e.$data];e=t.extend({koBindingContext:e},f.templateOptions);e=t.tmpl(h,b,e);e.appendTo(w.createElement("div"));
-t.fragments={};return e};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){w.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(t.tmpl.tag.ko_code={open:"__.push($1 || '');"},t.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};a.La.prototype=new a.C;var b=new a.La;0<b.ac&&a.Wa(b);a.b("jqueryTmplTemplateEngine",a.La)})()})})();})();
+t.fragments={};return e};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){w.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(t.tmpl.tag.ko_code={open:"__.push($1 || '');"},t.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};a.La.prototype=new a.C;var b=new a.La;0<b.ac&&a.Wa(b);a.b("jqueryTmplTemplateEngine",a.La)})()})})();})();

Disco.Web/ClientSource/Scripts/Modules/jQuery-Fancytree.js

@@ -5279,4 +5279,4 @@ $.ui.fancytree.registerExtension("themeroller", {
 //		node.debug("ext-themeroller.nodeRenderStatus: ", node.span.className);
 	}
 });
-}(jQuery, window, document));
+}(jQuery, window, document));

Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js

@@ -8,8 +8,7 @@
  *
  */
 
-/// <reference path="Scripts/jquery-1.6.4.js" />
+/// <reference path="../Core/jquery-2.1.1.js" />
-/// <reference path="jquery.signalR.version.js" />
 (function ($, window, undefined) {
 
     var resources = {
@@ -1301,19 +1300,19 @@
             return xhr;
         },
 
-        ajaxAbort: function (connection, async) {
+        ajaxAbort: function (connection, doAsync) {
             if (typeof (connection.transport) === "undefined") {
                 return;
             }
 
             // Async by default unless explicitly overidden
-            async = typeof async === "undefined" ? true : async;
+            doAsync = typeof doAsync === "undefined" ? true : doAsync;
 
             var url = getAjaxUrl(connection, "/abort");
 
             transportLogic.ajax(connection, {
                 url: url,
-                async: async,
+                async: doAsync,
                 timeout: 1000,
                 type: "POST"
             });
@@ -2907,6 +2906,11 @@
             registerHubProxies(proxies, false);
         });
 
+        proxies['deviceBatchUpdates'] = this.createHubProxy('deviceBatchUpdates');
+        proxies['deviceBatchUpdates'].client = {};
+        proxies['deviceBatchUpdates'].server = {
+        };
+
         proxies['deviceUpdates'] = this.createHubProxy('deviceUpdates'); 
         proxies['deviceUpdates'].client = { };
         proxies['deviceUpdates'].server = {

Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js

@@ -8,8 +8,8 @@
  *
  */
 
-/// <reference path="..\..\SignalR.Client.JS\Scripts\jquery-1.6.4.js" />
+/// <reference path="..\..\Core\jquery-2.1.1.js" />
-/// <reference path="jquery.signalR.js" />
+/// <reference path="jquery.signalR-2.1.1.js" />
 (function ($, window, undefined) {
     /// <param name="$" type="jQuery" />
     "use strict";

Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js

@@ -8,8 +8,7 @@
  *
  */
 
-/// <reference path="Scripts/jquery-1.6.4.js" />
+/// <reference path="../../Core/jquery-2.1.1.js" />
-/// <reference path="jquery.signalR.version.js" />
 (function ($, window, undefined) {
 
     var resources = {
@@ -1301,19 +1300,19 @@
             return xhr;
         },
 
-        ajaxAbort: function (connection, async) {
+        ajaxAbort: function (connection, doAsync) {
             if (typeof (connection.transport) === "undefined") {
                 return;
             }
 
             // Async by default unless explicitly overidden
-            async = typeof async === "undefined" ? true : async;
+            doAsync = typeof doAsync === "undefined" ? true : doAsync;
 
             var url = getAjaxUrl(connection, "/abort");
 
             transportLogic.ajax(connection, {
                 url: url,
-                async: async,
+                async: doAsync,
                 timeout: 1000,
                 type: "POST"
             });

Disco.Web/ClientSource/Scripts/Modules/jQueryUI-DynaTree.js

@@ -3334,4 +3334,4 @@ var _registerDnd = function() {
 };
 
 // ---------------------------------------------------------------------------
-}(jQuery));
+}(jQuery));

Disco.Web/ClientSource/Scripts/Modules/timeline.js

@@ -4430,4 +4430,4 @@ Timeline.GregorianDateLabeller.monthNames["en"] = [
 
 Timeline.GregorianDateLabeller.dayNames["en"] = [
     "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-];
+];

Disco.Web/Disco.Web.csproj

@@ -2382,6 +2382,13 @@
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
+  <Import Project="..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets" Condition="Exists('..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Disco.Web/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BuildBundlerMinifier" version="3.2.449" targetFramework="net45" />
   <package id="DotNet.Highcharts" version="4.0" targetFramework="net45" />
   <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
   <package id="EntityFramework.SqlServerCompact" version="4.3.6" targetFramework="net45" />