Update 3rd Party Libraries

Json.NET, jQuery, jQuery UI, modernizr, moment.js, Highcharts, TinyMCE,
normalize.css, T4MVC, RazorGenerator, Reactive Extensions

Disco.Web/ClientSource/Scripts/Modules/tinymce/themes/modern/theme.js

@@ -142,6 +142,20 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			return true;
 		}
 
+		// Convert toolbar array to multiple options
+		if (tinymce.isArray(settings.toolbar)) {
+			// Empty toolbar array is the same as a disabled toolbar
+			if (settings.toolbar.length === 0) {
+				return;
+			}
+
+			tinymce.each(settings.toolbar, function(toolbar, i) {
+				settings["toolbar" + (i + 1)] = toolbar;
+			});
+
+			delete settings.toolbar;
+		}
+
 		// Generate toolbar<n>
 		for (var i = 1; i < 10; i++) {
 			if (!addToolbar(settings["toolbar" + i])) {
@@ -149,12 +163,21 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			}
 		}
 
-		// Generate toolbar or default toolbar
-		if (!toolbars.length) {
+		// Generate toolbar or default toolbar unless it's disabled
+		if (!toolbars.length && settings.toolbar !== false) {
 			addToolbar(settings.toolbar || defaultToolbar);
 		}
 
-		return toolbars;
+		if (toolbars.length) {
+			return {
+				type: 'panel',
+				layout: 'stack',
+				classes: "toolbar-grp",
+				ariaRoot: true,
+				ariaRemember: true,
+				items: toolbars
+			};
+		}
 	}
 
 	/**
@@ -276,7 +299,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			var item = panel.find(type)[0];
 
 			if (item) {
-				item.focus();
+				item.focus(true);
 			}
 		}
 
@@ -340,7 +363,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 	 *
 	 * @return {Object} Name/value object with theme data.
 	 */
-	function renderInlineUI() {
+	function renderInlineUI(args) {
 		var panel, inlineToolbarContainer;
 
 		if (settings.fixed_toolbar_container) {
@@ -391,6 +414,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			// Render a plain panel inside the inlineToolbarContainer if it's defined
 			panel = self.panel = Factory.create({
 				type: inlineToolbarContainer ? 'panel' : 'floatpanel',
+				role: 'application',
 				classes: 'tinymce tinymce-inline',
 				layout: 'flex',
 				direction: 'column',
@@ -401,7 +425,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 				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()}
+					createToolbars()
 				]
 			});
 
@@ -412,6 +436,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 				]});
 			}*/
 
+			editor.fire('BeforeRenderUI');
 			panel.renderTo(inlineToolbarContainer || document.body).reflow();
 
 			addAccessibilityKeys(panel);
@@ -420,12 +445,22 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			editor.on('nodeChange', reposition);
 			editor.on('activate', show);
 			editor.on('deactivate', hide);
+
+			editor.nodeChanged();
 		}
 
 		settings.content_editable = true;
 
-		editor.on('focus', render);
-		editor.on('blur', hide);
+		editor.on('focus', function() {
+			// Render only when the CSS file has been loaded
+			if (args.skinUiCss) {
+				tinymce.DOM.styleSheetLoader.load(args.skinUiCss, render, render);
+			} else {
+				render();
+			}
+		});
+
+		editor.on('blur hide', hide);
 
 		// Remove the panel when the editor is removed
 		editor.on('remove', function() {
@@ -435,6 +470,11 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			}
 		});
 
+		// Preload skin css
+		if (args.skinUiCss) {
+			tinymce.DOM.styleSheetLoader.load(args.skinUiCss);
+		}
+
 		return {};
 	}
 
@@ -447,16 +487,21 @@ tinymce.ThemeManager.add('modern', function(editor) {
 	function renderIframeUI(args) {
 		var panel, resizeHandleCtrl, startSize;
 
+		if (args.skinUiCss) {
+			tinymce.DOM.loadCSS(args.skinUiCss);
+		}
+
 		// Basic UI layout
 		panel = self.panel = Factory.create({
 			type: 'panel',
+			role: 'application',
 			classes: 'tinymce',
 			style: 'visibility: hidden',
 			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()},
+				createToolbars(),
 				{type: 'panel', name: 'iframe', layout: 'stack', classes: 'edit-area', html: '', border: '1 0 0 0'}
 			]
 		});
@@ -487,7 +532,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 
 		// Add statusbar if needed
 		if (settings.statusbar !== false) {
-			panel.add({type: 'panel', name: 'statusbar', classes: 'statusbar', layout: 'flow', border: '1 0 0 0', items: [
+			panel.add({type: 'panel', name: 'statusbar', classes: 'statusbar', layout: 'flow', border: '1 0 0 0', ariaRoot: true, items: [
 				{type: 'elementpath'},
 				resizeHandleCtrl
 			]});
@@ -497,7 +542,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			panel.find('*').disabled(true);
 		}
 
-		// Render before the target textarea/div
+		editor.fire('BeforeRenderUI');
 		panel.renderBefore(args.targetNode).reflow();
 
 		if (settings.width) {
@@ -540,9 +585,9 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			// 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');
+				args.skinUiCss = skinUrl + '/skin.ie7.min.css';
 			} else {
-				tinymce.DOM.loadCSS(skinUrl + '/skin.min.css');
+				args.skinUiCss = skinUrl + '/skin.min.css';
 			}
 
 			// Load content.min.css or content.inline.min.css
@@ -560,12 +605,10 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			}
 		});
 
-		// Render inline UI
 		if (settings.inline) {
 			return renderInlineUI(args);
 		}
 
-		// Render iframe UI
 		return renderIframeUI(args);
 	};