yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated server side stuff to work with new yepnope which makes things much simpler.

Browse Source
This commit is contained in:
Shannon
2013-06-19 13:45:41 +10:00
parent 41346a784d
commit 8db763c953
31 changed files with 329 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18034
// Runtime Version:4.0.30319.18046
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -61,18 +61,42 @@ namespace Umbraco.Web.UI.JavaScript {
}
/// <summary>
/// Looks up a localized string similar to require.config(&quot;##RequireJsConfig##&quot;);
/// Looks up a localized string similar to [
/// &apos;lib/jquery/jquery-1.8.2.min.js&apos;,
/// &apos;lib/jquery/jquery.cookie.js&apos;,
/// &apos;lib/angular/angular.min.js&apos;,
/// &apos;lib/bootstrap/js/bootstrap.js&apos;,
/// &apos;lib/underscore/underscore.js&apos;,
/// &apos;lib/umbraco/Extensions.js&apos;,
///
///require(&quot;##RequireJsInitialize##&quot;, function (angular, myApp) {
/// &apos;js/app.js&apos;,
///
/// //This function will be called when all the dependencies
/// //listed above are loaded. Note that this function could
/// //be called before the page is loaded.
/// //This callback is optional.
/// &apos;js/umbraco.resources.js&apos;,
/// &apos;js/umbraco.directives.js&apos;,
/// &apos;js/umbraco.filters.js&apos;,
/// &apos;js/umbraco.services.js&apos;,
/// &apos;js/umbraco.security.js&apos;,
/// &apos;js/umbraco.controllers.js&apos;,
/// &apos;js/routes.js&apos;
///].
/// </summary>
internal static string JsInitialize {
get {
return ResourceManager.GetString("JsInitialize", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to yepnope({
///
/// jQuery(document).ready(function() {
/// angular.bootstrap(document, [&apos;myApp&apos;]);
/// });
/// load: &quot;##JsInitialize##&quot;,
///
/// complete: function () {
/// jQuery(document).ready(function () {
/// angular.bootstrap(document, [&apos;umbraco&apos;]);
/// });
///
/// }
///});.
/// </summary>
internal static string Main {
@@ -81,43 +105,6 @@ namespace Umbraco.Web.UI.JavaScript {
}
}
/// <summary>
/// Looks up a localized string similar to {
///
/// /*NOTE: This is actually /Belle/js because we are loading in requireJs from /Belle already*/
/// baseUrl: &apos;js&apos;,
///
/// waitSeconds: 120,
/// paths: {
/// jquery: &apos;../lib/jquery/jquery-1.8.2.min&apos;,
/// jqueryCookie: &apos;../lib/jquery/jquery.cookie&apos;,
/// bootstrap: &apos;../lib/bootstrap/js/bootstrap&apos;,
/// underscore: &apos;../lib/underscore/underscore&apos;,
/// angular: &apos;../lib/angular/angular&apos;,
/// angularResource: &apos;../lib/angular/angular-resource&apos;,
/// statemanager: &apos;../ [rest of string was truncated]&quot;;.
/// </summary>
internal static string RequireJsConfig {
get {
return ResourceManager.GetString("RequireJsConfig", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [
/// &apos;angular&apos;,
/// &apos;jquery&apos;,
/// &apos;underscore&apos;,
/// &apos;namespaceMgr&apos;,
/// &apos;myApp&apos;
///].
/// </summary>
internal static string RequireJsInitialize {
get {
return ResourceManager.GetString("RequireJsInitialize", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want