Merge pull request #377 from allmobilize/hzp

Datepicker and map update

js/ui.datepicker.js

@@ -12,8 +12,8 @@ var $doc = $(document);
 var Datepicker = function(element, options) {
   this.$element = $(element);
   this.options = $.extend({}, Datepicker.DEFAULTS, options);
-
   this.format = DPGlobal.parseFormat(this.options.format);
+
   this.$element.data('date', this.options.date);
   this.language = this.getLocale(this.options.locale);
   this.theme = this.options.theme;
@@ -623,9 +623,8 @@ $.fn.datepicker = function(option, val) {
     var data = $this.data('amui.datepicker');
 
     var options = $.extend({},
-      UI.utils.options($this.data('data-am-datepicker')),
+      UI.utils.options($this.data('am-datepicker')),
             typeof option === 'object' && option);
-
     if (!data) {
       $this.data('amui.datepicker', (data = new Datepicker(this, options)));
     }

widget/map/README.md

@@ -41,7 +41,11 @@ __经纬度获取：__打开[百度地图坐标拾取系统](http://api.map.baid
     "name": "", // 坐标名称
     "address": "", // 公司地址，地图定位的地址
     "longitude": "", // 经度
-    "latitude": "" // 纬度
+    "latitude": "" // 纬度    
+    "zoomControl": Boolean, // 是否开启地图缩放控件
+    "scaleControl": Boolean, // 是否开启地图比例尺控件
+    "setZoom": Number, // 设置地图缩放级别 3-18 
+    "icon": "" // 标注图标
   }
 }
 ```