Merge branch 'master' into 'master'

Master

See merge request !1

Resources/Public/Plugins/Typo3FileManager/typo3filemanager.js

@@ -116,14 +116,16 @@ var plugin = tinymce.PluginManager.add('typo3filemanager', function(editor, url)
 		title: 'TYPO3 Link',
 		icon: 'link',
 		shortcut: 'Ctrl+K',
-		onclick: openLinkDialog
+		onclick: openLinkDialog,
+		stateSelector: 'a[href]'
 	});
 
 	editor.addButton('typo3image', {
 		title: 'TYPO3 Image',
 		icon: 'image',
 		shortcut: 'Ctrl+L',
-		onclick: openImageDialog
+		onclick: openImageDialog,
+		stateSelector: 'img[src]'
 	});
 
 	// add the menu entries
@@ -133,7 +135,8 @@ var plugin = tinymce.PluginManager.add('typo3filemanager', function(editor, url)
 		prependToContext: true,
 		shortcut: 'Ctrl+K',
 		icon: 'link',
-		onclick: openLinkDialog
+		onclick: openLinkDialog,
+		stateSelector: 'a[href]'
 	});
 
 	editor.addMenuItem('typo3image', {
@@ -142,7 +145,8 @@ var plugin = tinymce.PluginManager.add('typo3filemanager', function(editor, url)
 		prependToContext: true,
 		shortcut: 'Ctrl+L',
 		icon: 'image',
-		onclick: openImageDialog
+		onclick: openImageDialog,
+		stateSelector: 'img[src]'
 	});
 
 	// initialize the shortcuts