jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 3rd-party libraries updated, refactoring

Browse Source 
Updated: SignalR 2.1.1, Moment.js 2.7, Reactive Extensions 2.2.5,
TinyMCE 4.1.2.
Customized TinyMCE skin and implemented FontAwesome icons.
T4MVC refactored.
This commit is contained in:
Gary Sharp
2014-07-26 15:54:01 +10:00
parent b78ce003a7
commit a43db01b96
110 changed files with 30460 additions and 21943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js
+100 -90
View File
@@ -1,8 +1,8 @@
///#source 1 1 /ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.0.js
///#source 1 1 /ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v2.1.0
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright (C) Microsoft Corporation. All rights reserved.
@@ -590,57 +590,66 @@
}, connection._.totalTransportConnectTimeout);
transport.start(connection, function () { // success
// Firefox 11+ doesn't allow sync XHR withCredentials: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#withCredentials
var isFirefox11OrGreater = signalR._.firefoxMajorVersion(window.navigator.userAgent) >= 11,
asyncAbort = !!connection.withCredentials && isFirefox11OrGreater;
var onStartSuccess = function () {
// Firefox 11+ doesn't allow sync XHR withCredentials: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#withCredentials
var isFirefox11OrGreater = signalR._.firefoxMajorVersion(window.navigator.userAgent) >= 11,
asyncAbort = !!connection.withCredentials && isFirefox11OrGreater;
// The connection was aborted while initializing transports
if (connection.state === signalR.connectionState.disconnected) {
return;
}
connection.log("The start request succeeded. Transitioning to the connected state.");
if (supportsKeepAlive(connection)) {
signalR.transports._logic.monitorKeepAlive(connection);
}
signalR.transports._logic.startHeartbeat(connection);
// Used to ensure low activity clients maintain their authentication.
// Must be configured once a transport has been decided to perform valid ping requests.
signalR._.configurePingInterval(connection);
if (!changeState(connection,
signalR.connectionState.connecting,
signalR.connectionState.connected)) {
connection.log("WARNING! The connection was not in the connecting state.");
}
// Drain any incoming buffered messages (messages that came in prior to connect)
connection._.connectingMessageBuffer.drain();
$(connection).triggerHandler(events.onStart);
// wire the stop handler for when the user leaves the page
_pageWindow.bind("unload", function () {
connection.log("Window unloading, stopping the connection.");
connection.stop(asyncAbort);
});
if (isFirefox11OrGreater) {
// Firefox does not fire cross-domain XHRs in the normal unload handler on tab close.
// #2400
_pageWindow.bind("beforeunload", function () {
// If connection.stop() runs runs in beforeunload and fails, it will also fail
// in unload unless connection.stop() runs after a timeout.
window.setTimeout(function () {
connection.stop(asyncAbort);
}, 0);
});
}
};
if (!initializationComplete) {
initializationComplete = true;
// Prevent transport fallback
window.clearTimeout(connection._.onFailedTimeoutHandle);
if (supportsKeepAlive(connection)) {
signalR.transports._logic.monitorKeepAlive(connection);
// The connection was aborted while initializing transports
if (connection.state === signalR.connectionState.disconnected) {
return;
}
signalR.transports._logic.startHeartbeat(connection);
// Used to ensure low activity clients maintain their authentication.
// Must be configured once a transport has been decided to perform valid ping requests.
signalR._.configurePingInterval(connection);
changeState(connection,
signalR.connectionState.connecting,
signalR.connectionState.connected);
// Drain any incoming buffered messages (messages that came in prior to connect)
connection._.connectingMessageBuffer.drain();
$(connection).triggerHandler(events.onStart);
// wire the stop handler for when the user leaves the page
_pageWindow.bind("unload", function () {
connection.log("Window unloading, stopping the connection.");
connection.stop(asyncAbort);
});
if (isFirefox11OrGreater) {
// Firefox does not fire cross-domain XHRs in the normal unload handler on tab close.
// #2400
_pageWindow.bind("beforeunload", function () {
// If connection.stop() runs runs in beforeunload and fails, it will also fail
// in unload unless connection.stop() runs after a timeout.
window.setTimeout(function () {
connection.stop(asyncAbort);
}, 0);
});
}
connection.log(transport.name + " transport selected. Initiating start request.");
signalR.transports._logic.ajaxStart(connection, onStartSuccess);
}
}, onFailed);
}
@@ -1313,62 +1322,57 @@
connection.log("Fired ajax abort async = " + async + ".");
},
tryInitialize: function (connection, persistentResponse, onInitialized) {
var startUrl,
xhr,
rejectDeferred = function (error) {
ajaxStart: function (connection, onSuccess) {
var rejectDeferred = function (error) {
var deferred = connection._deferral;
if (deferred) {
deferred.reject(error);
}
},
triggerStartError = function (error) {
connection.log("The start request failed. Stopping the connection.");
$(connection).triggerHandler(events.onError, [error]);
rejectDeferred(error);
connection.stop();
};
if (persistentResponse.Initialized) {
startUrl = getAjaxUrl(connection, "/start");
connection._.startRequest = transportLogic.ajax(connection, {
url: getAjaxUrl(connection, "/start"),
success: function (result, statusText, xhr) {
var data;
xhr = transportLogic.ajax(connection, {
url: startUrl,
success: function (result) {
var data;
try {
data = connection._parseResponse(result);
} catch (error) {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.errorParsingStartResponse, result),
error, xhr));
return;
}
if (data.Response === "started") {
onInitialized();
} else {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.invalidStartResponse, result),
null /* error */, xhr));
}
},
error: function (error, statusText) {
if (statusText !== startAbortText) {
triggerStartError(signalR._.error(
signalR.resources.errorDuringStartRequest,
error, xhr));
} else {
// Stop has been called
rejectDeferred(signalR._.error(
signalR.resources.stoppedDuringStartRequest,
null /* error */, xhr));
}
try {
data = connection._parseResponse(result);
} catch (error) {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.errorParsingStartResponse, result),
error, xhr));
return;
}
});
connection._.startRequest = xhr;
}
if (data.Response === "started") {
onSuccess();
} else {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.invalidStartResponse, result),
null /* error */, xhr));
}
},
error: function (xhr, statusText, error) {
if (statusText !== startAbortText) {
triggerStartError(signalR._.error(
signalR.resources.errorDuringStartRequest,
error, xhr));
} else {
// Stop has been called, no need to trigger the error handler
// or stop the connection again with onStartError
connection.log("The start request aborted because connection.stop() was called.");
rejectDeferred(signalR._.error(
signalR.resources.stoppedDuringStartRequest,
null /* error */, xhr));
}
}
});
},
tryAbortStartRequest: function (connection) {
@@ -1379,6 +1383,12 @@
}
},
tryInitialize: function (persistentResponse, onInitialized) {
if (persistentResponse.Initialized) {
onInitialized();
}
},
triggerReceived: function (connection, data) {
if (!connection._.connectingMessageBuffer.tryBuffer(data)) {
$(connection).triggerHandler(events.onReceived, [data]);
@@ -1405,7 +1415,7 @@
transportLogic.triggerReceived(connection, message);
});
transportLogic.tryInitialize(connection, data, onInitialized);
transportLogic.tryInitialize(data, onInitialized);
}
}
},
@@ -2815,12 +2825,12 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($, undefined) {
$.signalR.version = "2.1.0";
$.signalR.version = "2.1.1";
}(window.jQuery));
///#source 1 1 /ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js
/*!
* ASP.NET SignalR JavaScript Library v2.1.0
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.js.bundle
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<bundle minify="true" runOnBuild="true">
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.0.js</file>
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js</file>
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js</file>
</bundle>
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR.min.js.map
+3 -3
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/disco-hubs.js
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* ASP.NET SignalR JavaScript Library v2.1.0
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.0.js → Disco.Web/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-2.1.1.js
+98 -88
View File
@@ -1,7 +1,7 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v2.1.0
* ASP.NET SignalR JavaScript Library v2.1.1
* http://signalr.net/
*
* Copyright (C) Microsoft Corporation. All rights reserved.
@@ -589,57 +589,66 @@
}, connection._.totalTransportConnectTimeout);
transport.start(connection, function () { // success
// Firefox 11+ doesn't allow sync XHR withCredentials: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#withCredentials
var isFirefox11OrGreater = signalR._.firefoxMajorVersion(window.navigator.userAgent) >= 11,
asyncAbort = !!connection.withCredentials && isFirefox11OrGreater;
var onStartSuccess = function () {
// Firefox 11+ doesn't allow sync XHR withCredentials: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#withCredentials
var isFirefox11OrGreater = signalR._.firefoxMajorVersion(window.navigator.userAgent) >= 11,
asyncAbort = !!connection.withCredentials && isFirefox11OrGreater;
// The connection was aborted while initializing transports
if (connection.state === signalR.connectionState.disconnected) {
return;
}
connection.log("The start request succeeded. Transitioning to the connected state.");
if (supportsKeepAlive(connection)) {
signalR.transports._logic.monitorKeepAlive(connection);
}
signalR.transports._logic.startHeartbeat(connection);
// Used to ensure low activity clients maintain their authentication.
// Must be configured once a transport has been decided to perform valid ping requests.
signalR._.configurePingInterval(connection);
if (!changeState(connection,
signalR.connectionState.connecting,
signalR.connectionState.connected)) {
connection.log("WARNING! The connection was not in the connecting state.");
}
// Drain any incoming buffered messages (messages that came in prior to connect)
connection._.connectingMessageBuffer.drain();
$(connection).triggerHandler(events.onStart);
// wire the stop handler for when the user leaves the page
_pageWindow.bind("unload", function () {
connection.log("Window unloading, stopping the connection.");
connection.stop(asyncAbort);
});
if (isFirefox11OrGreater) {
// Firefox does not fire cross-domain XHRs in the normal unload handler on tab close.
// #2400
_pageWindow.bind("beforeunload", function () {
// If connection.stop() runs runs in beforeunload and fails, it will also fail
// in unload unless connection.stop() runs after a timeout.
window.setTimeout(function () {
connection.stop(asyncAbort);
}, 0);
});
}
};
if (!initializationComplete) {
initializationComplete = true;
// Prevent transport fallback
window.clearTimeout(connection._.onFailedTimeoutHandle);
if (supportsKeepAlive(connection)) {
signalR.transports._logic.monitorKeepAlive(connection);
// The connection was aborted while initializing transports
if (connection.state === signalR.connectionState.disconnected) {
return;
}
signalR.transports._logic.startHeartbeat(connection);
// Used to ensure low activity clients maintain their authentication.
// Must be configured once a transport has been decided to perform valid ping requests.
signalR._.configurePingInterval(connection);
changeState(connection,
signalR.connectionState.connecting,
signalR.connectionState.connected);
// Drain any incoming buffered messages (messages that came in prior to connect)
connection._.connectingMessageBuffer.drain();
$(connection).triggerHandler(events.onStart);
// wire the stop handler for when the user leaves the page
_pageWindow.bind("unload", function () {
connection.log("Window unloading, stopping the connection.");
connection.stop(asyncAbort);
});
if (isFirefox11OrGreater) {
// Firefox does not fire cross-domain XHRs in the normal unload handler on tab close.
// #2400
_pageWindow.bind("beforeunload", function () {
// If connection.stop() runs runs in beforeunload and fails, it will also fail
// in unload unless connection.stop() runs after a timeout.
window.setTimeout(function () {
connection.stop(asyncAbort);
}, 0);
});
}
connection.log(transport.name + " transport selected. Initiating start request.");
signalR.transports._logic.ajaxStart(connection, onStartSuccess);
}
}, onFailed);
}
@@ -1312,62 +1321,57 @@
connection.log("Fired ajax abort async = " + async + ".");
},
tryInitialize: function (connection, persistentResponse, onInitialized) {
var startUrl,
xhr,
rejectDeferred = function (error) {
ajaxStart: function (connection, onSuccess) {
var rejectDeferred = function (error) {
var deferred = connection._deferral;
if (deferred) {
deferred.reject(error);
}
},
triggerStartError = function (error) {
connection.log("The start request failed. Stopping the connection.");
$(connection).triggerHandler(events.onError, [error]);
rejectDeferred(error);
connection.stop();
};
if (persistentResponse.Initialized) {
startUrl = getAjaxUrl(connection, "/start");
connection._.startRequest = transportLogic.ajax(connection, {
url: getAjaxUrl(connection, "/start"),
success: function (result, statusText, xhr) {
var data;
xhr = transportLogic.ajax(connection, {
url: startUrl,
success: function (result) {
var data;
try {
data = connection._parseResponse(result);
} catch (error) {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.errorParsingStartResponse, result),
error, xhr));
return;
}
if (data.Response === "started") {
onInitialized();
} else {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.invalidStartResponse, result),
null /* error */, xhr));
}
},
error: function (error, statusText) {
if (statusText !== startAbortText) {
triggerStartError(signalR._.error(
signalR.resources.errorDuringStartRequest,
error, xhr));
} else {
// Stop has been called
rejectDeferred(signalR._.error(
signalR.resources.stoppedDuringStartRequest,
null /* error */, xhr));
}
try {
data = connection._parseResponse(result);
} catch (error) {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.errorParsingStartResponse, result),
error, xhr));
return;
}
});
connection._.startRequest = xhr;
}
if (data.Response === "started") {
onSuccess();
} else {
triggerStartError(signalR._.error(
signalR._.format(signalR.resources.invalidStartResponse, result),
null /* error */, xhr));
}
},
error: function (xhr, statusText, error) {
if (statusText !== startAbortText) {
triggerStartError(signalR._.error(
signalR.resources.errorDuringStartRequest,
error, xhr));
} else {
// Stop has been called, no need to trigger the error handler
// or stop the connection again with onStartError
connection.log("The start request aborted because connection.stop() was called.");
rejectDeferred(signalR._.error(
signalR.resources.stoppedDuringStartRequest,
null /* error */, xhr));
}
}
});
},
tryAbortStartRequest: function (connection) {
@@ -1378,6 +1382,12 @@
}
},
tryInitialize: function (persistentResponse, onInitialized) {
if (persistentResponse.Initialized) {
onInitialized();
}
},
triggerReceived: function (connection, data) {
if (!connection._.connectingMessageBuffer.tryBuffer(data)) {
$(connection).triggerHandler(events.onReceived, [data]);
@@ -1404,7 +1414,7 @@
transportLogic.triggerReceived(connection, message);
});
transportLogic.tryInitialize(connection, data, onInitialized);
transportLogic.tryInitialize(data, onInitialized);
}
}
},
@@ -2814,5 +2824,5 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($, undefined) {
$.signalR.version = "2.1.0";
$.signalR.version = "2.1.1";
}(window.jQuery));
Disco.Web/ClientSource/Scripts/Modules/tinymce.js
+4949 -3416
View File
File diff suppressed because it is too large Load Diff
Disco.Web/ClientSource/Scripts/Modules/tinymce.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/tinymce.min.js.map
+2 -2
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/tinymce/skins/lightgray/skin.ie7.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/tinymce/skins/lightgray/skin.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/tinymce/themes/modern/theme.js
+4 -4
View File
@@ -342,13 +342,13 @@ tinymce.ThemeManager.add('modern', function(editor) {
width = Math.max(settings.min_width || 100, width);
width = Math.min(settings.max_width || 0xFFFF, width);
DOM.css(containerElm, 'width', width + (containerSize.width - iframeSize.width));
DOM.css(iframeElm, 'width', width);
DOM.setStyle(containerElm, 'width', width + (containerSize.width - iframeSize.width));
DOM.setStyle(iframeElm, 'width', width);
}
height = Math.max(settings.min_height || 100, height);
height = Math.min(settings.max_height || 0xFFFF, height);
DOM.css(iframeElm, 'height', height);
DOM.setStyle(iframeElm, 'height', height);
editor.fire('ResizeEditor');
}
@@ -383,7 +383,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
deltaY = Math.max(0, scrollContainerPos.y - bodyPos.y);
}
panel.fixed(false).moveRel(body, editor.rtl ? ['tr-br', 'br-tr'] : ['tl-bl', 'bl-tl']).moveBy(deltaX, deltaY);
panel.fixed(false).moveRel(body, editor.rtl ? ['tr-br', 'br-tr'] : ['tl-bl', 'bl-tl', 'tr-br']).moveBy(deltaX, deltaY);
}
}
Disco.Web/ClientSource/Scripts/Modules/tinymce/themes/modern/theme.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/tinymce/themes/simple/theme.js
+6 -28
View File
@@ -311,13 +311,13 @@ tinymce.ThemeManager.add('simple', function(editor) {
width = Math.max(settings.min_width || 100, width);
width = Math.min(settings.max_width || 0xFFFF, width);
DOM.css(containerElm, 'width', width + (containerSize.width - iframeSize.width));
DOM.css(iframeElm, 'width', width);
DOM.setStyle(containerElm, 'width', width + (containerSize.width - iframeSize.width));
DOM.setStyle(iframeElm, 'width', width);
}
height = Math.max(settings.min_height || 100, height);
height = Math.min(settings.max_height || 0xFFFF, height);
DOM.css(iframeElm, 'height', height);
DOM.setStyle(iframeElm, 'height', height);
editor.fire('ResizeEditor');
}
@@ -352,7 +352,7 @@ tinymce.ThemeManager.add('simple', function(editor) {
deltaY = Math.max(0, scrollContainerPos.y - bodyPos.y);
}
panel.fixed(false).moveRel(body, editor.rtl ? ['tr-br', 'br-tr'] : ['tl-bl', 'bl-tl']).moveBy(deltaX, deltaY);
panel.fixed(false).moveRel(body, editor.rtl ? ['tr-br', 'br-tr'] : ['tl-bl', 'bl-tl', 'tr-br']).moveBy(deltaX, deltaY);
}
}
@@ -392,7 +392,6 @@ tinymce.ThemeManager.add('simple', function(editor) {
fixed: !!inlineToolbarContainer,
border: 1,
items: [
settings.menubar === false ? null : {type: 'menubar', border: '0 0 1 0', items: createMenuButtons()},
settings.toolbar === false ? null : {type: 'panel', name: 'toolbar', layout: 'stack', items: createToolbars()}
]
});
@@ -447,7 +446,6 @@ tinymce.ThemeManager.add('simple', function(editor) {
layout: 'stack',
border: 1,
items: [
settings.menubar === false ? null : {type: 'menubar', border: '0 0 1 0', items: createMenuButtons()},
settings.toolbar === false ? null : {type: 'panel', layout: 'stack', items: createToolbars()},
{type: 'panel', name: 'iframe', layout: 'stack', classes: 'edit-area', html: '', border: '1 0 0 0'}
]
@@ -518,28 +516,8 @@ tinymce.ThemeManager.add('simple', function(editor) {
* @return {Object} Theme UI data items.
*/
self.renderUI = function(args) {
var skin = settings.skin !== false ? settings.skin || 'lightgray' : false;
if (skin) {
var skinUrl = settings.skin_url;
if (skinUrl) {
skinUrl = editor.documentBaseURI.toAbsolute(skinUrl);
} else {
skinUrl = tinymce.baseURL + '/skins/' + skin;
}
// Load special skin for IE7
// TODO: Remove this when we drop IE7 support
if (tinymce.Env.documentMode <= 7) {
tinymce.DOM.loadCSS(skinUrl + '/skin.ie7.min.css');
} else {
tinymce.DOM.loadCSS(skinUrl + '/skin.min.css');
}
// Load content.min.css or content.inline.min.css
editor.contentCSS.push(skinUrl + '/content' + (editor.inline ? '.inline' : '') + '.min.css');
}
tinymce.DOM.loadCSS('/Style/tinymce/skin?v=1');
editor.contentCSS.push('/Style/tinymce/' + (editor.inline ? 'inline' : '') + 'content?v=1');
// Handle editor setProgressState change
editor.on('ProgressState', function(e) {
Disco.Web/ClientSource/Scripts/Modules/tinymce/tinymce.js
+4943 -3388
View File
File diff suppressed because it is too large Load Diff
Disco.Web/ClientSource/Scripts/Modules/tinymce/tinymce.min.js
Vendored
+11 -11
View File
File diff suppressed because one or more lines are too long