Skip to content

Commit 7ad6d22

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.Examples
2 parents 37768dd + 5246f3e commit 7ad6d22

15 files changed

Lines changed: 120 additions & 21 deletions

File tree

‎lib/ServiceStack.Common.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Interfaces.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.OrmLite.Sqlite.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.OrmLite.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.ServiceInterface.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Text.dll‎

0 Bytes
Binary file not shown.

‎lib/ServiceStack.dll‎

9.5 KB
Binary file not shown.

‎src/RedisStackOverflow/RedisStackOverflow/Web.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
6060
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
6161
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
62+
6263
<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>
6364
</httpHandlers>
6465
<httpModules>
@@ -91,6 +92,7 @@
9192
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
9293
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
9394
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
95+
9496
<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
9597
</handlers>
9698
</system.webServer>

‎src/RestFiles/RestFiles/default.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h3>Stop! old, outdated browser detected.</h3>
104104
if (($.browser.msie && $.browser.version < 9) || location.href.indexOf("fakeie") >= 0) {
105105
document.body.className = "lamebrowser";
106106
}
107-
$.ajaxSetup({ cache:false, contentType:'application/json' });
107+
$.ajaxSetup({ cache:false, dataType: 'json' });
108108

109109
function fromDtoDate (dateStr) {
110110
return new Date(parseFloat(/Date\(([^)]+)\)/.exec(dateStr)[1]));
@@ -139,7 +139,7 @@ <h3>Stop! old, outdated browser detected.</h3>
139139
if ($.isFunction(data)) {
140140
callback = data, data = {};
141141
}
142-
return $.ajax({ type: method, url: url, data: data, success: callback, dataType: type });
142+
return $.ajax({ type: method, url: url, data: data, success: callback, contentType: type });
143143
}
144144
$.extend({
145145
put: function(url, data, callback, type) {
@@ -205,7 +205,7 @@ <h3>Stop! old, outdated browser detected.</h3>
205205
$("#breadcrumb").html(sb + "</div>");
206206

207207
var jqLs = $("#ls");
208-
$.get(href, function(r) {
208+
$.getJSON(href, function(r) {
209209
var navBack = lastHref.length > href.length && lastHref.substr(0, href.length) == href,
210210
nextCls = navBack ? "results-0" : "results-2",
211211
hasResults = $("#ls TABLE").length == 1,
@@ -298,7 +298,7 @@ <h3>Stop! old, outdated browser detected.</h3>
298298
refresh();
299299
},
300300
savechanges: function() {
301-
$.put(lastHref, {TextContents: $("#fileview textarea").val()}, refresh);
301+
$.put(lastHref, {TextContents: $("#fileview textarea").val()}, refresh, 'application/x-www-form-urlencoded');
302302
href = dirPath(lastHref), location.hash = "#!" + href;
303303
},
304304
deletefile: function(el) {

‎src/ServiceStack.Examples/ServiceStack.Examples.Clients/Web.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<system.web>
1919
<!--
2020
Set compilation debug="true" to insert debugging
21-
symbols into the compiled page. Because this
21+
symbols into the compiled page. Because this
2222
affects performance, set this value to true only
2323
during development.
2424
-->

0 commit comments

Comments
 (0)