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

Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0

Browse Source
This commit is contained in:
perploug
2014-02-11 14:56:41 +01:00
parent 764644fc5d 36a8599e62
commit fa4e9d0cd1
35 changed files with 826 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
View File

@@ -41,10 +41,17 @@ namespace Umbraco.Web.UI.JavaScript
public string GetJavascriptInitialization(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)
{
var result = GetJavascriptInitializationArray(httpContext, umbracoInit, additionalJsFiles);
var noCache = string.Empty;
//if debugging, add timestamp, if in production CDF will append CDF version (and should also append umb version)
if (httpContext.IsDebuggingEnabled)
noCache = Resources.JsNoCache;
return ParseMain(
result.ToString(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
return ParseMain(
noCache,
result.ToString(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
}
public JArray GetJavascriptInitializationArray(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)

1
src/Umbraco.Web/UI/JavaScript/Main.js
View File

@@ -1,3 +1,4 @@
"##JsNoCache##"
yepnope({
load: [
'lib/jquery/jquery-2.0.3.min.js',

77
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.18046
// Runtime Version:4.0.30319.18408
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -62,23 +62,23 @@ namespace Umbraco.Web.UI.JavaScript {
/// <summary>
/// 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;,
/// &apos;lib/jquery/jquery-ui-1.10.3.custom.min.js&apos;,
///
/// &apos;js/app.js&apos;,
/// /*
/// &apos;lib/jquery/jquery-ui-1.10.3.custom.min.js&apos;,
/// &apos;lib/jquery/jquery.ui.core.min.js&apos;,
/// &apos;lib/jquery/jquery.ui.widget.min.js&apos;,
/// &apos;lib/jquery/jquery.ui.mouse.min.js&apos;,
/// &apos;lib/jquery/jquery.ui.sortable.min.js&apos;,
/// */
///
/// &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;
///].
/// &apos;lib/angular/1.1.5/angular-cookies.min.js&apos;,
/// &apos;lib/angular/1.1.5/angular-mobile.js&apos;,
/// &apos;lib/angular/1.1.5/angular-sanitize.min.js&apos;,
///
/// &apos;lib/angular/angular-ui-sortable.js&apos;,
///
/// &apos;lib/jquery/jquery.u [rest of string was truncated]&quot;;.
/// </summary>
internal static string JsInitialize {
get {
@@ -87,18 +87,45 @@ namespace Umbraco.Web.UI.JavaScript {
}
/// <summary>
/// Looks up a localized string similar to yepnope({
///
/// load: &quot;##JsInitialize##&quot;,
///
/// complete: function () {
/// jQuery(document).ready(function () {
/// angular.bootstrap(document, [&apos;umbraco&apos;]);
/// });
///
/// Looks up a localized string similar to yepnope.addFilter(function (resourceObj) {
/// var url = resourceObj.url;
/// var _op = &quot;?&quot;;
/// if(url.indexOf(&quot;lib/&quot;) === 0 || url.indexOf(&quot;js/umbraco.&quot;) === 0){
/// return resourceObj;
/// }
/// if(url.indexOf(&quot;?&quot;) &gt; 0){
/// _op = &quot;&amp;&quot;;
/// }
///
/// resourceObj.url = resourceObj.url + _op + &quot;umb__rnd=&quot; + (new Date).getTime();
/// return resourceObj;
///});.
/// </summary>
internal static string JsNoCache {
get {
return ResourceManager.GetString("JsNoCache", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &quot;##JsNoCache##&quot;
///yepnope({
/// load: [
/// &apos;lib/jquery/jquery-2.0.3.min.js&apos;,
/// &apos;lib/angular/1.1.5/angular.min.js&apos;,
/// &apos;lib/underscore/underscore.js&apos;,
/// ],
/// complete: function () {
/// yepnope({
/// load: &quot;##JsInitialize##&quot;,
/// complete: function () {
///
/// //we need to set the legacy UmbClientMgr path
/// UmbClientMgr.setUmbracoPath(&apos;&quot;##UmbracoPath##&quot;&apos;);
///
/// jQuery(document).ready(function () {
/// [rest of string was truncated]&quot;;.
/// </summary>
internal static string Main {
get {
return ResourceManager.GetString("Main", resourceCulture);

15
src/Umbraco.Web/UI/JavaScript/Resources.resx
View File

@@ -121,6 +121,21 @@
<data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>jsinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="JsNoCache" xml:space="preserve">
<value>yepnope.addFilter(function (resourceObj) {
var url = resourceObj.url;
var _op = "?";
if(url.indexOf("lib/") === 0 || url.indexOf("js/umbraco.") === 0){
return resourceObj;
}
if(url.indexOf("?") &gt; 0){
_op = "&amp;";
}
resourceObj.url = resourceObj.url + _op + "umb__rnd=" + (new Date).getTime();
return resourceObj;
});</value>
</data>
<data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>