Merge remote-tracking branch 'origin/dev' into dev

dialogs/markers/markers.js

@@ -25,10 +25,23 @@
         initEvent: function ( km, $w ) {
             $w.on( "click", "li", function () {
                 var $this = $( this );
+                $this.siblings().removeClass( "active" );
+                $this.toggleClass( "active" );
                 var val = $this.val();
+                if ( !$this.hasClass( "active" ) ) {
+                    val = null;
+                }
                 var type = $this.attr( "type" );
                 km.execCommand( type, val );
             } );
+            km.on( 'interactchange', function ( e ) {
+                var valPri = this.queryCommandValue( "setpriority" );
+                var valPro = this.queryCommandValue( "setprogress" );
+                $w.find( "li[type='setpriority']" ).removeClass( "active" );
+                $w.find( "li[type='setpriority'][value='" + valPri + "']" ).addClass( "active" );
+                $w.find( "li[type='setprogress']" ).removeClass( "active" );
+                $w.find( "li[type='setprogress'][value='" + valPro + "']" ).addClass( "active" );
+            } );
         },
         buttons: {
             'ok': {

lang/zh-cn/zh-cn.js

 KityMinder.LANG[ 'zh-cn' ] = {
+    'maintopic': '中心主题',
+    'topic': '分支主题',
     'tooltips': {
         'undo': '撤销',
         'redo': '重做',

src/core/kityminder.js

 var KityMinder =
     window.KM =
-    window.KityMinder = function(){
+    window.KityMinder = function () {
         var instanceMap = {}, instanceId = 0;
         return {
-            version : '1.0.0',
-            createMinder : function ( renderTarget, options ) {
+            version: '1.0.0',
+            createMinder: function ( renderTarget, options ) {
                 options = options || {};
                 options.renderTo = Utils.isString( renderTarget ) ? document.getElementById( renderTarget ) : renderTarget;
                 var minder = new Minder( options );
-                this.addMinder(options.renderTo,minder);
+                this.addMinder( options.renderTo, minder );
                 return minder;
             },
-            addMinder :  function ( target, minder ) {
+            addMinder: function ( target, minder ) {
                 var id;
                 if ( typeof ( target ) === 'string' ) {
                     id = target;
@@ -20,17 +20,16 @@ var KityMinder =
                 }
                 instanceMap[ id ] = minder;
             },
-            getMinder : function(target,options){
+            getMinder: function ( target, options ) {
                 var id;
                 if ( typeof ( target ) === 'string' ) {
                     id = target;
                 } else {
                     id = target.id || ( "KM_INSTANCE_" + instanceId++ );
                 }
-                return instanceMap[ id ] || this.createMinder(target,options);
+                return instanceMap[ id ] || this.createMinder( target, options );
             },
             //挂接多语言
-            LANG:{}
+            LANG: {}
         }
-    }();
-
+}();
\ No newline at end of file

src/core/minder.js

@@ -39,7 +39,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
 
         this._addRenderContainer();
 
-        this._root = new MinderNode( "Main Topic" );
+        this._root = new MinderNode( this.getLang().maintopic );
         this._root.setType( "root" );
         if ( this._options.renderTo ) {
             this.renderTo( this._options.renderTo );

src/core/minder.module.js

@@ -38,12 +38,12 @@ kity.extendClass( Minder, {
                 }
             }
 
-            if(moduleDeals.defaultOptions){
-                this.setDefaultOptions(moduleDeals.defaultOptions);
+            if ( moduleDeals.defaultOptions ) {
+                this.setDefaultOptions( moduleDeals.defaultOptions );
             }
             //添加模块的快捷键
-            if(moduleDeals.addShortcutKeys){
-                this.addShortcutKeys(moduleDeals.addShortcutKeys)
+            if ( moduleDeals.addShortcutKeys ) {
+                this.addShortcutKeys( moduleDeals.addShortcutKeys )
             }
 
         }

src/module/icon.js

@@ -54,8 +54,13 @@ KityMinder.registerModule( "IconModule", function () {
 				}
 			},
 			queryValue: function ( km ) {
-				var node = km.getSelectedNode();
-				return node.getData( "PriorityIcon" );
+				var nodes = km.getSelectedNodes();
+				var val;
+				for ( var i = 0; i < nodes.length; i++ ) {
+					val = nodes[ i ].getData( "PriorityIcon" );
+					if ( val ) break;
+				}
+				return val;
 			}
 		};
 	} )() );
@@ -70,8 +75,13 @@ KityMinder.registerModule( "IconModule", function () {
 				}
 			},
 			queryValue: function ( km ) {
-				var node = km.getSelectedNode();
-				return node.getData( "ProgressIcon" );
+				var nodes = km.getSelectedNodes();
+				var val;
+				for ( var i = 0; i < nodes.length; i++ ) {
+					val = nodes[ i ].getData( "ProgressIcon" );
+					if ( val ) break;
+				}
+				return val;
 			}
 		};
 	} )() );

src/module/keyboard.js

@@ -90,11 +90,11 @@ KityMinder.registerModule( "KeyboardModule", function () {
                 this.receiver.keydownNode = node;
                 switch ( e.originEvent.keyCode ) {
                 case keys.Enter:
-                    this.execCommand( 'appendSiblingNode', new MinderNode( 'Topic' ) );
+                    this.execCommand( 'appendSiblingNode', new MinderNode( this.getLang().topic ) );
                     e.preventDefault();
                     break;
                 case keys.Tab:
-                    this.execCommand( 'appendChildNode', new MinderNode( 'Topic' ) );
+                    this.execCommand( 'appendChildNode', new MinderNode( this.getLang().topic ) );
                     e.preventDefault();
                     break;
                 case keys.Backspace:

themes/default/_css/dialogsize.css

@@ -15,7 +15,7 @@
     cursor: pointer;
     color: #333
 }
-.icon-list li:hover{
+.icon-list li:hover,.icon-list li.active{
     background: #cfe0f7
 }
 .icon-list li span.icon{