Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg

frio - fix image upload for prv messages

view/theme/frio/css/style.css

@@ -2409,10 +2409,13 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
     height: 48px;
     width: 48px;
 }
-
 #prvmail-end {
     clear:both;
 }
+#modal #prvmail-text-edit-bb .bb-img {
+    display: none;
+}
+
 /* photos */
 .photo-album-actions {
     margin-bottom: 10px;

view/theme/frio/js/filebrowser.js

@@ -231,7 +231,6 @@ var FileBrowser = {
 		$(".fbrowser .fbswitcher [data-mode=" + FileBrowser.type + "]").addClass("active");
 		// We need to add the AjaxUpload to the button
 		FileBrowser.uploadButtons();
-		
 	},
 
 	// Load new content (e.g. change photo album)

view/theme/frio/js/modal.js

@@ -152,6 +152,7 @@ Dialog._load = function(url) {
 	var jsbrowser = function() {
 		FileBrowser.init(nickname, type, hash);
 	};
+	loadScript("view/js/ajaxupload.js");
 	loadScript("view/theme/frio/js/filebrowser.js", jsbrowser);
 };
 

view/theme/frio/js/theme.js

@@ -446,8 +446,16 @@ function justifyPhotosAjax() {
 	$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
+// Load a js script to the html head.
 function loadScript(url, callback) {
-	// Adding the script tag to the head as suggested before
+	// Check if the script is already in the html head.
+	var oscript = $('head script[src="' + url + '"]');
+
+	// Delete the old script from head.
+	if (oscript.length > 0) {
+		oscript.remove();
+	}
+	// Adding the script tag to the head as suggested before.
 	var head = document.getElementsByTagName('head')[0];
 	var script = document.createElement('script');
 	script.type = 'text/javascript';
@@ -458,7 +466,7 @@ function loadScript(url, callback) {
 	script.onreadystatechange = callback;
 	script.onload = callback;
 
-	// Fire the loading
+	// Fire the loading.
 	head.appendChild(script);
 }
 

view/theme/frio/templates/comment_item.tpl

@@ -33,7 +33,7 @@
 			{{/if}}
 			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
 				<li>
-					<button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
 						<i class="fa fa-picture-o"></i>
 					</button>
 				</li>

view/theme/frio/templates/event_form.tpl

@@ -79,7 +79,7 @@
 				<ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+						<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
 							<i class="fa fa-picture-o"></i>
 						</button>
 					</li>
@@ -126,7 +126,7 @@
 				<ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+						<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
 							<i class="fa fa-picture-o"></i>
 						</button>
 					</li>

view/theme/frio/templates/prv_message.tpl

@@ -33,7 +33,7 @@
 
 	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
-					<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
 						<i class="fa fa-picture-o" aria-hidden="true"></i>
 					</button>
 				</li>