Merge pull request #191 from drub0y/master

Fix for bug in signalR::stop
SignalR · Feb 12, 2012 · fc36f8f · fc36f8f
2 parents b3fc2d7 + ef99a12
commit fc36f8f
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 78 deletions.
diff --git a/SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js b/SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js
@@ -282,7 +282,7 @@
             delete connection.groups;
 
             // Trigger the disconnect event
-            $connection.trigger(events.onDisconnect);
+            $(connection).trigger(events.onDisconnect);
 
             return connection;
         },

diff --git a/SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js b/SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js
diff --git a/SignalR.Hosting.Owin.Samples/Content/Scripts/jquery.signalR.js b/SignalR.Hosting.Owin.Samples/Content/Scripts/jquery.signalR.js
diff --git a/SignalR.Hosting.Owin.Samples/Content/Scripts/jquery.signalR.min.js b/SignalR.Hosting.Owin.Samples/Content/Scripts/jquery.signalR.min.js
diff --git a/SignalR.Hosting.Owin.Samples/SignalR.Hosting.Owin.Samples.csproj b/SignalR.Hosting.Owin.Samples/SignalR.Hosting.Owin.Samples.csproj
@@ -210,11 +210,8 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+	<Target Name="BeforeBuild">
+		<Copy SourceFiles="..\SignalR\Scripts\jquery.signalR.js" DestinationFiles="Content\Scripts\jquery.signalR.js" />
+		<Copy SourceFiles="..\SignalR\Scripts\jquery.signalR.min.js" DestinationFiles="Content\Scripts\jquery.signalR.min.js" />
+	</Target>
 </Project>
diff --git a/SignalR.Hosting.Owin/SignalR.Hosting.Owin.csproj b/SignalR.Hosting.Owin/SignalR.Hosting.Owin.csproj
@@ -74,11 +74,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/SignalR/Scripts/jquery.signalR.js b/SignalR/Scripts/jquery.signalR.js
@@ -282,7 +282,7 @@
             delete connection.groups;
 
             // Trigger the disconnect event
-            $connection.trigger(events.onDisconnect);
+            $(connection).trigger(events.onDisconnect);
 
             return connection;
         },

diff --git a/SignalR/Scripts/jquery.signalR.min.js b/SignalR/Scripts/jquery.signalR.min.js