Merge branch 'wrdp' into 'release'

Wrdp

See merge request o2oa/o2oa!2339

o2web/source/x_component_Attendance/AddressExplorer.js

@@ -170,7 +170,7 @@ MWF.xApplication.Attendance.AddressExplorer.BaiduMap = new Class({
         //var apiPath = "http://api.map.baidu.com/api?v=2.0&ak=Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg";
         var apiPath;
         var accountkey = ak || "Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg";
-        if( window.location.protocol.toLowerCase() === "https" ){
+        if( window.location.protocol.toLowerCase() === "https:" ){
             apiPath = "https://api.map.baidu.com/getscript?v=2.0&ak="+accountkey+"&services=&t=20161219171637";
         }else{
             apiPath = "http://api.map.baidu.com/getscript?v=2.0&ak="+accountkey+"&services=&t=20161219171637";

o2web/source/x_desktop/js/base.js

@@ -225,7 +225,7 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
     };
 
     var _openApplicationPC = function (appNames, options, statusObj) {
-        delete options.docTitle;
+        if (options) delete options.docTitle;
         var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
         switch (appNames) {
             case "process.Work":