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

Fixed mediadashboard problem, ClientDependency doesn't like newlines in js using \

Browse Source
This commit is contained in:
sebastiaan
2012-09-04 08:10:29 -02:00
parent f486ff6441
commit 673e040aa3
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI/umbraco_client/FileUploader/js/jquery.fileUploader.js
View File

@@ -49,16 +49,13 @@
FileUploader.prototype = {
// Private methods
_init: function () {
var self = this;
// Init vars
self.wrapperId = 'fu-fileUploader-' + self.uploaderId;
self.wrapper = ' \
<div id="' + self.wrapperId + '" class="fu-fileUploader"> \
<div class="fu-formContainer"></div> \
<div class="fu-itemContainer"></div> \
</div>';
self.wrapper = '<div id="' + self.wrapperId + '" class="fu-fileUploader"><div class="fu-formContainer"></div><div class="fu-itemContainer"></div></div>';
self.wrapperSelector = '#' + self.wrapperId;
self.formContainerSelector = self.wrapperSelector + " .fu-formContainer";
@@ -256,7 +253,7 @@
var response = self.opts.onUpload(data);
if (response === false) {
return false; //TODO: Raise onDone event?
}
}
self.inProgressItemId = data.itemId;
@@ -364,7 +361,7 @@
if (count === undefined) {
count = 0;
}
if ($.fileUploader.percentageInterval[count]) {
data.progress = $.fileUploader.percentageInterval[count] + Math.floor(Math.random() * 5 + 1);
self.opts.onProgress(data);

37
src/Umbraco.Web/UI/Controls/FolderBrowser.cs
View File

@@ -1,41 +1,37 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Web;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
using ClientDependency.Core;
using umbraco.BasePages;
using umbraco.BusinessLogic;
using umbraco.IO;
using umbraco.cms.businesslogic.media;
namespace Umbraco.Web.UI.Controls
{
[ClientDependency(ClientDependencyType.Css, "ContextMenu/Css/jquery.contextMenu.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Css, "FolderBrowser/Css/folderbrowser.css", "UmbracoClient")]
[ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 1)]
[ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 1)]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient", Priority = 2)]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.mapping.js", "UmbracoClient", Priority = 3)]
[ClientDependency(ClientDependencyType.Javascript, "ContextMenu/Js/jquery.contextMenu.js", "UmbracoClient", Priority = 3)]
[ClientDependency(ClientDependencyType.Javascript, "FileUploader/js/jquery.fileUploader.js", "UmbracoClient", Priority = 4)]
[ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 2)]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient", Priority = 3)]
[ClientDependency(ClientDependencyType.Javascript, "ui/knockout.mapping.js", "UmbracoClient", Priority = 4)]
[ClientDependency(ClientDependencyType.Javascript, "ContextMenu/Js/jquery.contextMenu.js", "UmbracoClient", Priority = 5)]
[ClientDependency(ClientDependencyType.Javascript, "FileUploader/js/jquery.fileUploader.js", "UmbracoClient", Priority = 6)]
[ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient", Priority = 10)]
[ToolboxData("<{0}:FolderBrowser runat=server></{0}:FolderBrowser>")]
public class FolderBrowser : WebControl
{
protected Panel panel;
protected Panel Panel;
protected int ParentId
{
get
{
// Try and parse from querystring
if(!string.IsNullOrEmpty(Context.Request.QueryString["id"]))
if (!string.IsNullOrEmpty(Context.Request.QueryString["id"]))
{
int id;
if(Int32.TryParse(Context.Request.QueryString["id"], out id))
if (Int32.TryParse(Context.Request.QueryString["id"], out id))
return id;
}
@@ -73,22 +69,21 @@ namespace Umbraco.Web.UI.Controls
protected override void CreateChildControls()
{
// Create the panel surround
panel = new Panel
Panel = new Panel
{
ID = "FolderBrowser",
ID = "FolderBrowser",
CssClass = "umbFolderBrowser"
};
panel.Attributes.Add("data-parentid", ParentId.ToString());
Panel.Attributes.Add("data-parentid", ParentId.ToString());
var sb = new StringBuilder();
// Create the breadcrumb
var breadCrumb = new List<global::umbraco.cms.businesslogic.media.Media>();
breadCrumb.Add(ParentNode);
var breadCrumb = new List<global::umbraco.cms.businesslogic.media.Media> { ParentNode };
var parent = ParentNode;
while(parent.Id != -1)
while (parent.Id != -1)
{
parent = new global::umbraco.cms.businesslogic.media.Media(parent.ParentId);
breadCrumb.Add(parent);
@@ -99,7 +94,7 @@ namespace Umbraco.Web.UI.Controls
sb.Append("<ul class='breadcrumb'><li><strong>You are here:</strong></li>");
foreach (var media in breadCrumb)
{
if(media.Id == ParentId)
if (media.Id == ParentId)
if (media.Id == -1)
sb.AppendFormat("<li>Media</li>");
else
@@ -133,9 +128,9 @@ namespace Umbraco.Web.UI.Controls
"<li data-bind=\"attr: { 'data-id': Id, 'data-order': $index() }, css: { selected: selected() }, event: { mousedown: toggleSelected, contextmenu: toggleSelected, dblclick: edit }\"><div><span class='img'><img data-bind='attr: { src: ThumbnailUrl }' /></span><span data-bind='text: Name'></span></div></li>" +
"</ul>");
panel.Controls.Add(new LiteralControl(sb.ToString()));
Panel.Controls.Add(new LiteralControl(sb.ToString()));
Controls.Add(panel);
Controls.Add(Panel);
Page.ClientScript.RegisterStartupScript(typeof(FolderBrowser),
"RegisterFolderBrowsers",