Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

Conflicts:
	src/ui/dropmenu.js

src/core/minder.js

@@ -27,6 +27,9 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
 
         this._paper = new kity.Paper();
         this._paper.getNode().setAttribute( 'contenteditable', true );
+        this._paper.getNode().ondragstart = function(e) {
+            e.preventDefault();
+        };
 
         this._addRenderContainer();
 

src/ui/dropmenu.js

@@ -33,13 +33,13 @@ KM.ui.define('dropmenu', {
         return this;
     },
     show:function(){
-         if(this.trigger('beforeshow') === false){
-             return;
-         }else{
-             this.root().css({display:'block'});
-             this.trigger('aftershow');
-         }
-         return this;
+        if(this.trigger('beforeshow') === false){
+            return;
+        }else{
+            this.root().css({display:'block'});
+            this.trigger('aftershow');
+        }
+        return this;
     },
     init: function (options) {
         var me = this;

src/ui/menu.js

@@ -31,7 +31,7 @@ KM.ui.define('menu',{
         var me = this;
         if(!$obj.data('$mergeObj')){
             $obj.data('$mergeObj',me.root());
-            if($obj.kmui().wrapclick){
+            if($obj.kmui()){
                 $obj.on('wrapclick',function(evt){
                     me.supper.show.call(me,$obj,'','offset',15)
                 });

themes/default/css/dialog.css

 .kmui-modal {
     position: fixed;
-    top: 10px;
+    top: 60px;
     right:10px;
     background-color: #ffffff;
     outline: 0;

themes/default/css/dropmenu.css

@@ -20,11 +20,12 @@
 
 .kmui-dropdown-menu .kmui-divider {
     height: 1px;
-    margin: 9px 0;
+    margin: 5px 0;
     overflow: hidden;
     background-color: #e5e5e5;
 }
-.kmui-dropdown-menu .kmui-divider:first-child {
+.kmui-dropdown-menu .kmui-divider:first-child,
+.kmui-dropdown-menu .kmui-divider:last-child {
     display: none;
 }