Skip to content

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

merge from dev

parents 99208ad2 93098502
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 43 deletions
dev/index.html
View file @ b233a04f
...@@ -17,16 +17,13 @@ ...@@ -17,16 +17,13 @@
<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 href="../dialogs/dialogs.css" rel="stylesheet" type="text/css" /> <link href="../dialogs/dialogs.css" rel="stylesheet" type="text/css" />
<script>
$(function () {
// create km instance
window.km = KM.getKityMinder('kityminder');
});
</script>
</head> </head>
<body> <body>
<div id="kityminder" onselectstart="return false"></div> <div id="kityminder" onselectstart="return false"></div>
</body> </body>
<script>
// create km instance
window.km = KM.getKityMinder('kityminder');
</script>
</html> </html>
\ No newline at end of file
dist/index.html
View file @ b233a04f
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
<link rel="stylesheet" href="css/links.css" /> <link rel="stylesheet" href="css/links.css" />
<script>
$(function () {
// create km instance
window.km = KM.getKityMinder('kityminder');
});
</script>
</head> </head>
<body> <body>
...@@ -39,4 +33,8 @@ ...@@ -39,4 +33,8 @@
</p> </p>
</body> </body>
<script>
// create km instance
window.km = KM.getKityMinder('kityminder');
</script>
</html> </html>
\ No newline at end of file
social/social.js
View file @ b233a04f
...@@ -10,10 +10,8 @@ $.extend( $.fn, { ...@@ -10,10 +10,8 @@ $.extend( $.fn, {
}, },
loading: function ( text ) { loading: function ( text ) {
if ( text ) { if ( text ) {
if ( !this.disabled() ) { this.disabled( true );
this.disabled( true ); this.attr( 'origin-text', this.text() );
this.attr( 'origin-text', this.text() );
}
this.text( text ); this.text( text );
} else { } else {
this.text( this.attr( 'origin-text' ) ); this.text( this.attr( 'origin-text' ) );
...@@ -49,7 +47,7 @@ $( function () { ...@@ -49,7 +47,7 @@ $( function () {
} }
} )(); } )();
$login_btn = $( '<button>登录</button>' ).addClass( 'login' ).click( login ); $login_btn = $( '<button>登录</button>' ).addClass( 'login' ).click( login ).appendTo( $panel );
$user_btn = $( '<button><span class="text"></span></button>' ).addClass( 'user-file' ); $user_btn = $( '<button><span class="text"></span></button>' ).addClass( 'user-file' );
...@@ -69,13 +67,16 @@ $( function () { ...@@ -69,13 +67,16 @@ $( function () {
$user_menu.attachTo( $user_btn ); $user_menu.attachTo( $user_btn );
$save_btn = $( '<button>保存</button>' ).click( saveThisFile ).addClass( 'baidu-cloud' ); $save_btn = $( '<button>保存</button>' ).click( saveThisFile )
.addClass( 'baidu-cloud' ).appendTo( $panel ).disabled( true );
$share_btn = $( '<button>分享</button>' ).click( shareThisFile ).addClass( 'share' ); $share_btn = $( '<button>分享</button>' ).click( shareThisFile )
.addClass( 'share' ).appendTo( $panel ).disabled( true );
var AK, thisMapFilename, currentUser, share_id = uuid(), var AK, thisMapFilename, currentUser, share_id = uuid(),
isShareLink; isShareLink, isFileSaved = true,
draft = {};
AK = 'wiE55BGOG8BkGnpPs6UNtPbb'; AK = 'wiE55BGOG8BkGnpPs6UNtPbb';
...@@ -100,9 +101,9 @@ $( function () { ...@@ -100,9 +101,9 @@ $( function () {
function setCurrentUser( user ) { function setCurrentUser( user ) {
currentUser = user; currentUser = user;
$user_btn.text( user.getName() + ' 的脑图' ); $user_btn.text( user.getName() + ' 的脑图' );
$user_btn.appendTo( $panel ); $user_btn.prependTo( $panel );
$save_btn.appendTo( $panel ); $save_btn.disabled( false );
$share_btn.appendTo( $panel ); $share_btn.disabled( false );
$login_btn.detach(); $login_btn.detach();
loadRecent(); loadRecent();
loadAvator(); loadAvator();
...@@ -166,20 +167,26 @@ $( function () { ...@@ -166,20 +167,26 @@ $( function () {
function loadPersonal( path ) { function loadPersonal( path ) {
var sto = baidu.frontia.personalStorage; var sto = baidu.frontia.personalStorage;
thisMapFilename = path; thisMapFilename = path;
$user_btn.loading( '加载“' + getFileName( path ) + '”...' ); if ( thisMapFilename == draft.filename ) {
sto.getFileUrl( path, { $user_btn.loading( false ).text( getFileName( path ) );
success: function ( url ) { setFileSaved( false );
$.ajax( { } else {
cache: false, $user_btn.loading( '加载“' + getFileName( path ) + '”...' );
url: url, sto.getFileUrl( path, {
dataType: 'text', success: function ( url ) {
success: function ( result ) { $.ajax( {
window.km.importData( result, 'json' ); cache: false,
$user_btn.loading( false ).text( getFileName( path ) ); url: url,
} dataType: 'text',
} ); success: function ( result ) {
} window.km.importData( result, 'json' );
} ); $user_btn.loading( false ).text( getFileName( path ) );
isFileSaved = true;
}
} );
}
} );
}
} }
function getMapFileName() { function getMapFileName() {
...@@ -197,10 +204,7 @@ $( function () { ...@@ -197,10 +204,7 @@ $( function () {
var data = window.km.exportData( 'json' ); var data = window.km.exportData( 'json' );
save( data, thisMapFilename || getMapFileName(), function ( success, info ) { save( data, thisMapFilename || getMapFileName(), function ( success, info ) {
if ( success ) { if ( success ) {
$save_btn.text( '保存成功！' ); $save_btn.text( '已保存！' );
setTimeout( function () {
$save_btn.loading( false );
}, 3000 );
if ( !thisMapFilename ) { if ( !thisMapFilename ) {
thisMapFilename = info.path; thisMapFilename = info.path;
addToRecentMenu( [ info ] ); addToRecentMenu( [ info ] );
...@@ -217,6 +221,7 @@ $( function () { ...@@ -217,6 +221,7 @@ $( function () {
var options = { var options = {
ondup: thisMapFilename ? sto.constant.ONDUP_OVERWRITE : sto.constant.ONDUP_NEWCOPY, ondup: thisMapFilename ? sto.constant.ONDUP_OVERWRITE : sto.constant.ONDUP_NEWCOPY,
success: function ( result ) { success: function ( result ) {
setFileSaved( true );
callback( true, result ); callback( true, result );
}, },
error: function ( error ) { error: function ( error ) {
...@@ -318,6 +323,43 @@ $( function () { ...@@ -318,6 +323,43 @@ $( function () {
thisMapFilename = decodeURIComponent( match[ 1 ] ); thisMapFilename = decodeURIComponent( match[ 1 ] );
} }
function setFileSaved( saved ) {
$save_btn.disabled( saved );
if ( saved ) {
$user_btn.text( getFileName( thisMapFilename ) );
} else {
$save_btn.text( '保存' );
$user_btn.text( getFileName( thisMapFilename || getMapFileName() ) + ' *' );
}
}
function checkAutoSave() {
var sto = window.localStorage;
if ( !sto ) return;
draft = {
filename: thisMapFilename,
data: window.km.exportData( 'json' )
};
sto.setItem( 'draft_filename', draft.filename );
sto.setItem( 'draft_data', draft.data );
setFileSaved( false );
}
function loadAutoSave() {
var sto = window.localStorage;
if ( !sto ) return;
draft.data = sto.getItem( 'draft_data' );
draft.filename = sto.getItem( 'draft_filename' );
if ( draft.data ) {
window.km.importData( draft.data, 'json' );
setFileSaved( false );
}
}
loadAutoSave();
loadShare(); loadShare();
currentUser = baidu.frontia.getCurrentAccount(); currentUser = baidu.frontia.getCurrentAccount();
...@@ -328,6 +370,10 @@ $( function () { ...@@ -328,6 +370,10 @@ $( function () {
loadPersonal( thisMapFilename ); loadPersonal( thisMapFilename );
} }
} else { } else {
$login_btn.appendTo( $panel ); loadAutoSave();
} }
window.km.on( 'contentchange', function () {
checkAutoSave();
} );
} ); } );
\ No newline at end of file
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