Browse Source

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Luke Pulverenti 12 years ago
parent
commit
93ad0e469c

+ 1 - 0
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -422,6 +422,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js", 
                                 "http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js",
                                 "thirdparty/video-js-3.2.0/video.min.js",
+                                "thirdparty/autoNumeric.js",
                                 "scripts/all.js" + versionString
             };
 

+ 3 - 0
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -377,6 +377,9 @@
     <Content Include="dashboard-ui\scripts\videojsextensions.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\thirdparty\autoNumeric.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\demo.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>