Skip to content

K
kityminder-core
Commit 0523e1d0 authored by techird's avatar techird
Browse files
Options

Merge branch 'dev' into gh-pages

parents 7fce48b2 a4301c1c
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 75 deletions
dist/index.html
View file @ 0523e1d0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<script src="social.js" charset="utf-8"></script> <script src="social.js" charset="utf-8"></script>
<script src="../kity/dist/kitygraph.all.js" charset="utf-8"></script> <script src="../kity/dist/kitygraph.all.js" charset="utf-8"></script>
<script src="../configure.js" charset="utf-8"></script> <script src="../configure.js" charset="utf-8"></script>
<script src="../dist/dev.js" charset="utf-8"></script> <script src="../dist/dev.php" charset="utf-8"></script>
<script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script> <script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
<link href="../themes/default/css/import.css" type="text/css" rel="stylesheet"> <link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
<link rel="stylesheet" href="social.css"> <link rel="stylesheet" href="social.css">
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
html, body, div.kmui-editor-body {
height: 100%;
-moz-user-select: none;
}
</style> </style>
</head> </head>
<body > <body >
......
dist/social.css
View file @ 0523e1d0
#social{position:absolute;right:10px;top:10px;line-height:20px;text-align:right;overflow:hidden}#social button{outline:none;display:inline-block;padding:0 15px;height:35px;font-size:13px;line-height:35px;text-align:center;border-radius:5px;color:#fff;text-decoration:none;border:none;margin-left:5px;cursor:pointer;background:#0099f2;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOTlmMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDA5NmVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwNzZkZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);background:-moz-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-webkit-gradient(linear, left top, left bottom, color-stop(0, #0099f2), color-stop(0, #4096ee), color-stop(100%, #0076dd));background:-webkit-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-o-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-ms-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:linear-gradient(to bottom, #0099f2 0, #4096ee 0, #0076dd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0099f2', endColorstr='#0076dd', GradientType=0);}#social button:hover{background:#009fff} #social {
#social button[disabled]{background:#aaa} position: absolute;
#social button.baidu-cloud{padding-left:35px;position:relative}#social button.baidu-cloud:before{content:' ';display:block;width:24px;height:24px;background:url(../themes/default/images/baiducloud.png);position:absolute;left:7px;top:5px} right: 10px;
#social button.share{padding-left:35px;position:relative}#social button.share:before{content:' ';display:block;width:24px;height:24px;background:url(../themes/default/images/share.png) no-repeat;position:absolute;left:7px;top:5px} top: 10px;
#social button img{position:relative;top:3px;border-radius:2px;margin-right:7px} line-height: 20px;
#social button.user-file{padding-right:28px;position:relative}#social button.user-file:after{content:' ';display:block;position:absolute;right:10px;top:15px;width:0;height:0;border:solid;border-width:4px 5px;border-color:#fff transparent transparent transparent} text-align: right;
.user-file-menu{margin-top:20px;margin-left:1px} overflow: hidden;
}
#social button {
font-family: Arial, "Heiti SC", "Microsoft Yahei";
outline: none;
display: inline-block;
padding: 0 15px;
height: 35px;
font-size: 13px;
line-height: 35px;
text-align: center;
border-radius: 5px;
color: #ffffff;
text-decoration: none;
border: none;
margin-left: 5px;
cursor: pointer;
background: #0099f2;
/* Old browsers */
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOTlmMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDA5NmVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwNzZkZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
background: -moz-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%);
/* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0099f2), color-stop(0%, #4096ee), color-stop(100%, #0076dd));
/* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%);
/* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%);
/* Opera 11.10+ */
background: -ms-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%);
/* IE10+ */
background: linear-gradient(to bottom, #0099f2 0%, #4096ee 0%, #0076dd 100%);
/* W3C */
}
#social button:hover {
background: #009fff;
}
#social button[disabled] {
background: #AAA;
}
#social button.baidu-cloud {
padding-left: 35px;
position: relative;
}
#social button.baidu-cloud:before {
content: ' ';
display: block;
width: 24px;
height: 24px;
background: url(../themes/default/images/baiducloud.png);
position: absolute;
left: 7px;
top: 5px;
}
#social button.share {
padding-left: 35px;
position: relative;
}
#social button.share:before {
content: ' ';
display: block;
width: 24px;
height: 24px;
background: url(../themes/default/images/share.png) no-repeat;
position: absolute;
left: 7px;
top: 5px;
}
#social button img {
position: relative;
top: 3px;
border-radius: 2px;
margin-right: 7px;
}
#social button.user-file {
padding-right: 28px;
position: relative;
}
#social button.user-file:after {
content: ' ';
display: block;
position: absolute;
right: 10px;
top: 15px;
width: 0;
height: 0;
border: solid;
border-width: 4px 5px;
border-color: #FFFFFF transparent transparent transparent;
}
.user-file-menu {
margin-top: 20px;
margin-left: 1px;
}
dist/social.js
View file @ 0523e1d0
...@@ -141,7 +141,7 @@ $( function () { ...@@ -141,7 +141,7 @@ $( function () {
} }
function addToRecentMenu( list ) { function addToRecentMenu( list ) {
console.log( list ); list.splice(8);
list.forEach( function ( file ) { list.forEach( function ( file ) {
$user_menu.appendItem( { $user_menu.appendItem( {
item: { item: {
......
dist/social.less
View file @ 0523e1d0
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
text-align: right; text-align: right;
overflow: hidden; overflow: hidden;
button { button {
font-family: Arial, "Heiti SC", "Microsoft Yahei";
outline: none; outline: none;
display: inline-block; display: inline-block;
padding: 0 15px; padding: 0 15px;
...@@ -27,7 +28,6 @@ ...@@ -27,7 +28,6 @@
background: -o-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Opera 11.10+ */ background: -o-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* IE10+ */ background: -ms-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* IE10+ */
background: linear-gradient(to bottom, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* W3C */ background: linear-gradient(to bottom, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0099f2', endColorstr='#0076dd',GradientType=0 ); /* IE6-8 */
&:hover { &:hover {
background: #009fff; background: #009fff;
......
src/core/minder.js
View file @ 0523e1d0
...@@ -27,6 +27,9 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", { ...@@ -27,6 +27,9 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
this._paper = new kity.Paper(); this._paper = new kity.Paper();
this._paper.getNode().setAttribute( 'contenteditable', true ); this._paper.getNode().setAttribute( 'contenteditable', true );
this._paper.getNode().ondragstart = function(e) {
e.preventDefault();
};
this._addRenderContainer(); this._addRenderContainer();
......
src/module/paste.js 0 → 100644
View file @ 0523e1d0
KityMinder.registerModule( "pasteModule", function () {
var km = this;
//getSelectedTopNodes
return {
};
} );
\ No newline at end of file
src/ui/dropmenu.js
View file @ 0523e1d0
//dropmenu 类 //dropmenu 类
KM.ui.define( 'dropmenu', { KM.ui.define('dropmenu', {
tmpl: '<ul class="kmui-dropdown-menu" aria-labelledby="dropdownMenu" >' + tmpl: '<ul class="kmui-dropdown-menu" aria-labelledby="dropdownMenu" >' +
'<%if(data && data.length){for(var i=0,ci;ci=data[i++];){%>' + '<%if(data && data.length){for(var i=0,ci;ci=data[i++];){%>' +
'<%if(ci.divider){%><li class="kmui-divider"></li><%}else{%>' + '<%if(ci.divider){%><li class="kmui-divider"></li><%}else{%>' +
'<li <%if(ci.active||ci.disabled){%>class="<%= ci.active|| \'\' %> <%=ci.disabled||\'\' %>" <%}%> data-value="<%= ci.value%>" data-label="<%= ci.label%>">' + '<li <%if(ci.active||ci.disabled){%>class="<%= ci.active|| \'\' %> <%=ci.disabled||\'\' %>" <%}%> data-value="<%= ci.value%>" data-label="<%= ci.label%>">' +
'<a href="#" tabindex="-1"><em class="kmui-dropmenu-checkbox"><i class="kmui-icon-ok"></i></em><%= ci.label%></a>' + '<a href="#" tabindex="-1"><em class="kmui-dropmenu-checkbox"><i class="kmui-icon-ok"></i></em><%= ci.label%></a>' +
'</li><%}}%>' + '</li><%}}%>' +
'<%}%>' + '<%}%>'+
'</ul>', '</ul>',
subTmpl: '<%if(data && data.length){for(var i=0,ci;ci=data[i++];){%>' + subTmpl:'<%if(data && data.length){for(var i=0,ci;ci=data[i++];){%>' +
'<%if(ci.divider){%><li class="kmui-divider"></li><%}else{%>' + '<%if(ci.divider){%><li class="kmui-divider"></li><%}else{%>' +
'<li <%if(ci.active||ci.disabled){%>class="<%= ci.active|| \'\' %> <%=ci.disabled||\'\' %>" <%}%> data-value="<%= ci.value%>" data-label="<%= ci.label%>">' + '<li <%if(ci.active||ci.disabled){%>class="<%= ci.active|| \'\' %> <%=ci.disabled||\'\' %>" <%}%> data-value="<%= ci.value%>" data-label="<%= ci.label%>">' +
'<a href="#" tabindex="-1"><em class="kmui-dropmenu-checkbox"><i class="kmui-icon-ok"></i></em><%= ci.label%></a>' + '<a href="#" tabindex="-1"><em class="kmui-dropmenu-checkbox"><i class="kmui-icon-ok"></i></em><%= ci.label%></a>' +
...@@ -16,33 +16,32 @@ KM.ui.define( 'dropmenu', { ...@@ -16,33 +16,32 @@ KM.ui.define( 'dropmenu', {
'<%}%>', '<%}%>',
defaultOpt: { defaultOpt: {
data: [], data: [],
click: function () {} click: function () {
}
}, },
setData: function ( items ) { setData:function(items){
this.root().html( $.parseTmpl( this.subTmpl, items ) ); this.root().html($.parseTmpl(this.subTmpl,items));
return this; return this;
}, },
position: function ( offset ) { position:function(offset){
this.root().css( { this.root().css({
left: offset.x, left:offset.x,
top: offset.y top:offset.y
} ); });
return this; return this;
}, },
show: function () { show:function(){
if ( this.trigger( 'beforeshow' ) === false ) { if(this.trigger('beforeshow') === false){
return; return;
} else { }else{
this.root().css( { this.root().css({display:'block'});
display: 'block' this.trigger('aftershow');
} );
this.trigger( 'aftershow' );
} }
return this; return this;
}, },
init: function ( options ) { init: function (options) {
var me = this; var me = this;
var eventName = { var eventName = {
click: 1, click: 1,
...@@ -50,48 +49,54 @@ KM.ui.define( 'dropmenu', { ...@@ -50,48 +49,54 @@ KM.ui.define( 'dropmenu', {
mouseout: 1 mouseout: 1
}; };
this.root( $( $.parseTmpl( this.tmpl, options ) ) ).on( 'click', 'li[class!="kmui-disabled kmui-divider kmui-dropdown-submenu"]', function ( evt ) { this.root($($.parseTmpl(this.tmpl, options))).on('click', 'li[class!="kmui-disabled kmui-divider kmui-dropdown-submenu"]',function (evt) {
$.proxy( options.click, me, evt, $( this ).data( 'value' ), $( this ).data( 'label' ), $( this ) )() $.proxy(options.click, me, evt, $(this).data('value'), $(this).data('label'),$(this))()
} ).find( 'li' ).each( function ( i, el ) { }).find('li').each(function (i, el) {
var $this = $( this ); var $this = $(this);
if ( !$this.hasClass( "kmui-disabled kmui-divider kmui-dropdown-submenu" ) ) { if (!$this.hasClass("kmui-disabled kmui-divider kmui-dropdown-submenu")) {
var data = options.data[ i ]; var data = options.data[i];
$.each( eventName, function ( k ) { $.each(eventName, function (k) {
data[ k ] && $this[ k ]( function ( evt ) { data[k] && $this[k](function (evt) {
$.proxy( data[ k ], el )( evt, data, me.root ) $.proxy(data[k], el)(evt, data, me.root)
} ) })
} ) })
} }
} ) });
}, },
disabled: function ( cb ) { _initEvent:function(){
$( 'li[class!=kmui-divider]', this.root() ).each( function () { this.root().on('mouseover','li[class="kmui-dropdown-submenu',function(e){
var $el = $( this ); var $submenu = $(this).data('widget');
if ( cb === true ) { $submenu.kmui().show($(this),'right','position',5,2)
$el.addClass( 'kmui-disabled' ) });
} else if ( $.isFunction( cb ) ) { },
$el.toggleClass( 'kmui-disabled', cb( li ) ) disabled: function (cb) {
$('li[class!=kmui-divider]', this.root()).each(function () {
var $el = $(this);
if (cb === true) {
$el.addClass('kmui-disabled')
} else if ($.isFunction(cb)) {
$el.toggleClass('kmui-disabled', cb(li))
} else { } else {
$el.removeClass( 'kmui-disabled' ) $el.removeClass('kmui-disabled')
} }
} ); });
}, },
val: function ( val ) { val: function (val) {
var currentVal; var currentVal;
$( 'li[class!="kmui-divider kmui-disabled kmui-dropdown-submenu"]', this.root() ).each( function () { $('li[class!="kmui-divider kmui-disabled kmui-dropdown-submenu"]', this.root()).each(function () {
var $el = $( this ); var $el = $(this);
if ( val === undefined ) { if (val === undefined) {
if ( $el.find( 'em.kmui-dropmenu-checked' ).length ) { if ($el.find('em.kmui-dropmenu-checked').length) {
currentVal = $el.data( 'value' ); currentVal = $el.data('value');
return false return false
} }
} else { } else {
$el.find( 'em' ).toggleClass( 'kmui-dropmenu-checked', $el.data( 'value' ) == val ) $el.find('em').toggleClass('kmui-dropmenu-checked', $el.data('value') == val)
} }
} ); });
if ( val === undefined ) { if (val === undefined) {
return currentVal return currentVal
} }
}, },
...@@ -104,18 +109,18 @@ KM.ui.define( 'dropmenu', { ...@@ -104,18 +109,18 @@ KM.ui.define( 'dropmenu', {
var $item = $( html ).click( item.click ); var $item = $( html ).click( item.click );
this.root().append( $item ); this.root().append( $item );
}, },
addSubmenu: function ( label, menu, index ) { addSubmenu: function (label, menu, index) {
index = index || 0; index = index || 0;
var $list = $( 'li[class!=kmui-divider]', this.root() ); var $list = $('li[class!=kmui-divider]', this.root());
var $node = $( '<li class="kmui-dropdown-submenu"><a tabindex="-1" href="#">' + label + '</a></li>' ).append( menu ); var $node = $('<li class="kmui-dropdown-submenu"><a tabindex="-1" href="#">' + label + '</a></li>').append(menu);
$node.data('widget',menu);
if ( index >= 0 && index < $list.length ) { if (index >= 0 && index < $list.length) {
$node.insertBefore( $list[ index ] ); $node.insertBefore($list[index]);
} else if ( index < 0 ) { } else if (index < 0) {
$node.insertBefore( $list[ 0 ] ); $node.insertBefore($list[0]);
} else if ( index >= $list.length ) { } else if (index >= $list.length) {
$node.appendTo( $list ); $node.appendTo($list);
} }
} }
}, 'menu' ); }, 'menu');
\ No newline at end of file \ No newline at end of file
themes/default/css/dialog.css
View file @ 0523e1d0
.kmui-modal { .kmui-modal {
position: fixed; position: fixed;
top: 10px; top: 60px;
right:10px; right:10px;
background-color: #ffffff; background-color: #ffffff;
outline: 0; outline: 0;
......
themes/default/css/kityminder.css
View file @ 0523e1d0
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
border-radius: 4px; border-radius: 4px;
box-shadow: 3px 3px 8px rgba(0,0,0, .5); box-shadow: 3px 3px 8px rgba(0,0,0, .5);
} }
.kmui-container .kmui-editor-body{ .kmui-container .kmui-editor-body {
background: rgb(50, 60, 61) url(../images/grid.png) repeat; background: rgb(50, 60, 61) url(../images/grid.png) repeat;
line-height: 0; /*line-height: 0;*/
overflow: hidden; overflow: hidden;
} }
svg { svg {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment