Permalink
Browse files

Added last version of jquery 1.7.1

  • Loading branch information...
jbalde committed Apr 18, 2012
1 parent 05a5e8e commit 4ef57f1baca670040b60bbef487be28abe6eccd5
Showing with 2,045 additions and 1,701 deletions.
  1. +15 −1 AltairStudios.Core/Util/StringConverter.cs
  2. +2,030 −1,700 AltairStudios.Core/resources/js/jquery.js
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
+using AltairStudios.Core.Mvc;
namespace AltairStudios.Core.Util {
@@ -32,7 +33,8 @@ public class StringConverter {
case "Double": converted = this.convert((double)val); break;
case "Decimal": converted = this.convert((decimal)val); break;
case "Boolean": converted = this.convert((bool)val); break;
- case "Model": converted = "null"; break;
+ case "Model": converted = this.convert((Model)val); break;
+ case "ModelList": converted = this.convert((ModelList<Model>)val); break;
default: converted = "\"\""; break;
}
@@ -41,6 +43,18 @@ public class StringConverter {
+ public string convert(Model val) {
+ return val.ToJson();
+ }
+
+
+
+ public string convert<T>(ModelList<T> val) {
+ return val.ToJson();
+ }
+
+
+
/// <summary>
/// Convert the specified val.
/// </summary>
Oops, something went wrong.

0 comments on commit 4ef57f1

Please sign in to comment.