Skip to content

K
kityminder-core
Commit 6dfb569a authored by techird's avatar techird
Browse files
Options

merge from dev

parents f84236ca 65f76506
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
dialogs/help/help.js
View file @ 6dfb569a
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
helpContent += '<p>使用百度账号登录后，您可以使用云存储和分享功能</p>'; helpContent += '<p>使用百度账号登录后，您可以使用云存储和分享功能</p>';
helpContent += '<ul>'; helpContent += '<ul>';
helpContent += ' <li><h3>登录：</h3>点击登录按钮</li>'; helpContent += ' <li><h3>登录：</h3>点击登录按钮</li>';
helpContent += ' <li><h3>保存：</h3>点击保存按钮，将会把文件保存到你的云盘里</li>'; helpContent += ' <li><h3>保存(CTRL+S)：</h3>点击保存按钮，将会把文件保存到你的云盘里</li>';
helpContent += ' <li><h3>分享：</h3>点击分享按钮，会生成分享链接，该链接可以打开您分享的脑图</li>'; helpContent += ' <li><h3>分享(CTRL+SHIFT+S)：</h3>点击分享按钮，会生成分享链接，该链接可以打开您分享的脑图</li>';
helpContent += ' <li><h3>打开：</h3>点击您账号的下拉按钮，会列出最近保存的脑图文件，点击即可打开</li>'; helpContent += ' <li><h3>打开：</h3>点击您账号的下拉按钮，会列出最近保存的脑图文件，点击即可打开</li>';
helpContent += '</ul>'; helpContent += '</ul>';
......
dist/index.html
View file @ 6dfb569a
...@@ -24,11 +24,9 @@ ...@@ -24,11 +24,9 @@
<body> <body>
<div id="kityminder" onselectstart="return false"></div> <div id="kityminder" onselectstart="return false"></div>
<div id="github-url">
<a href="https://github.com/fex-team/kityminder.git" target="_blank">Fork me on Github</a>
</div>
<p id="about"> <p id="about">
KityMinder <a id="km-version" href="https://github.com/fex-team/kityminder/blob/dev/CHANGELOG.md" target="blank"></a>, Powered by f-cube, <a href="http://fex.baidu.com" target="_blank">FEX</a> | KityMinder <a id="km-version" href="https://github.com/fex-team/kityminder/blob/dev/CHANGELOG.md" target="blank"></a>, Powered by f-cube, <a href="http://fex.baidu.com" target="_blank">FEX</a> |
<a href="https://github.com/fex-team/kityminder.git" target="_blank">Source</a> |
<a href="https://github.com/fex-team/kityminder/issues/new" target="_blank">Report a Bug</a> | <a href="https://github.com/fex-team/kityminder/issues/new" target="_blank">Report a Bug</a> |
<a href="mailto:kity@baidu.com" target="_blank">Contact Us</a> <a href="mailto:kity@baidu.com" target="_blank">Contact Us</a>
</p> </p>
......
social/social.js
View file @ 6dfb569a
...@@ -158,6 +158,7 @@ $( function () { ...@@ -158,6 +158,7 @@ $( function () {
baidu.frontia.storage.findData( query, { baidu.frontia.storage.findData( query, {
success: function ( ret ) { success: function ( ret ) {
draftManager.create();
minder.importData( ret.result[ 0 ].obj.shareMinder.data, 'json' ); minder.importData( ret.result[ 0 ].obj.shareMinder.data, 'json' );
$share_btn.loading( false ); $share_btn.loading( false );
}, },
...@@ -319,7 +320,7 @@ $( function () { ...@@ -319,7 +320,7 @@ $( function () {
function openFile( e ) { function openFile( e ) {
var path = $( this ).data( 'value' ); var path = $( this ).data( 'value' );
var draft = draftManager.getCurrent(); var draft = draftManager.getCurrent();
if ( draft.path == path ) { if ( draft && draft.path == path ) {
if ( !draft.sync && window.confirm( '“' + getFileName( path ) + '”在草稿箱包含未保存的更改，确定加载网盘版本覆盖草稿箱中的版本吗？' ) ) { if ( !draft.sync && window.confirm( '“' + getFileName( path ) + '”在草稿箱包含未保存的更改，确定加载网盘版本覆盖草稿箱中的版本吗？' ) ) {
setRemotePath( path, true ); setRemotePath( path, true );
loadRemote(); loadRemote();
......
src/module/editor.js
View file @ 6dfb569a
...@@ -171,7 +171,8 @@ KityMinder.registerModule( "TextEditModule", function () { ...@@ -171,7 +171,8 @@ KityMinder.registerModule( "TextEditModule", function () {
} }
if(e.commandName == 'priority' || e.commandName == 'progress'){ if((e.commandName == 'priority' || e.commandName == 'progress') && this.getStatus() == 'textedit' ){
receiver.setBaseOffset() receiver.setBaseOffset()
.getTextOffsetData(); .getTextOffsetData();
......
src/module/history.js
View file @ 6dfb569a
...@@ -173,6 +173,9 @@ KityMinder.registerModule( "HistoryModule", function () { ...@@ -173,6 +173,9 @@ KityMinder.registerModule( "HistoryModule", function () {
km.historyManager.saveScene() km.historyManager.saveScene()
} }
} }
},
"import":function(){
this.historyManager.reset()
} }
} }
}; };
......
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