Merge branch 'master' of https://github.com/inverse-inc/sogo

UI/Templates/MailerUI/UIxMailPopupView.wox

@@ -7,6 +7,7 @@
     className="UIxPageFrame"
     title="title"
     const:jsFiles="SOGoAutoCompletion.js"
+    const:userDefaultsKeys="SOGoMailDisplayRemoteInlineImages"
     const:popup="YES">
   <script type="text/javascript">
     var messageName = '<var:string value="clientObject.relativeImap4Name"/>';

UI/WebServerResources/UIxComponentEditor.js

@@ -192,7 +192,7 @@ function onComponentEditorLoad(event) {
     initializeClassificationMenu();
     var list = $("calendarList");
     if (list) {
-        list.on("change", onChangeCalendar, false);
+        list.on("change", onChangeCalendar);
         list.fire("mousedown");
     }
     

UI/WebServerResources/UIxMailPopupView.js

@@ -13,6 +13,9 @@ function initPopupMailer(event) {
     configureLoadImagesButton();
     configureSignatureFlagImage();
 
+    if (UserDefaults["SOGoMailDisplayRemoteInlineImages"] == 'always')
+        loadRemoteImages();
+
     window.messageUID = mailboxName + "/" + messageName;
 
     handleReturnReceipt();

UI/WebServerResources/UIxPreferences.js

@@ -115,7 +115,7 @@ function prototypeIfyFilters() {
 function _setupEvents() {
     var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
                     "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
-                    "firstWeek", "messageCheck", "sortByThreads",
+                    "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
                     "subscribedFoldersOnly", "language", "defaultCalendar",
                     "enableVacation" ];
     for (var i = 0; i < widgets.length; i++) {