Merge branch 'gh-pages' of https://github.com/benweet/stackedit.git into gh-pages

This commit is contained in:
benweet 2013-03-25 19:26:14 +00:00
commit 09645f2447
3 changed files with 37 additions and 17 deletions

View File

@ -4,8 +4,6 @@ body {
} }
#file-title { #file-title {
float:right;
padding: 10px;
} }
#file-title-input { #file-title-input {

View File

@ -41,7 +41,10 @@
<div class="navbar-inner"> <div class="navbar-inner">
<div id="wmd-button-bar" class="nav"></div> <div id="wmd-button-bar" class="nav"></div>
<ul class="nav pull-right"> <ul class="nav pull-right">
<li class="navbar-form pull-left"> <li>
<a class="brand pull-right" id="file-title" href="javascript:void(0);"></a>
</li>
<li class="navbar-form">
<input id="file-title-input" type="text" class="span3" placeholder="File title" /> <input id="file-title-input" type="text" class="span3" placeholder="File title" />
</li> </li>
<li class="dropdown"><a class="dropdown-toggle" <li class="dropdown"><a class="dropdown-toggle"
@ -58,8 +61,8 @@
<li><a id="drive-link" href="javascript:void(0);"><i class="icon-magnet"></i> Link <li><a id="drive-link" href="javascript:void(0);"><i class="icon-magnet"></i> Link
with Google Drive</a></li> with Google Drive</a></li>
</ul></li> </ul></li>
<li class="divider-vertical"></li>
</ul> </ul>
<a class="brand pull-right" id="file-title" href="javascript:void(0);"></a>
</div> </div>
</div> </div>
<textarea id="wmd-input"></textarea> <textarea id="wmd-input"></textarea>

View File

@ -23,12 +23,12 @@ var fileManager = (function($) {
$("#file-title-input").blur(function() { $("#file-title-input").blur(function() {
var title = $.trim($(this).val()); var title = $.trim($(this).val());
if(title) { if(title) {
fileIndex = localStorage["file.current"]; var fileIndex = localStorage["file.current"];
localStorage[fileIndex + ".title"] = title; localStorage[fileIndex + ".title"] = title;
} }
$(this).hide(); $(this).hide();
$("#file-title").show(); $("#file-title").show();
fileManager.selectFile(); fileManager.updateFileTitleUI();
}); });
}; };
@ -40,7 +40,7 @@ var fileManager = (function($) {
} }
this.updateFileTitleList(); this.updateFileTitleList();
// If no file create one // If no file create one
if(this.fileTitleList.length == 0) { if(this.fileTitleList.length === 0) {
this.createFile(); this.createFile();
this.updateFileTitleList(); this.updateFileTitleList();
} }
@ -58,9 +58,8 @@ var fileManager = (function($) {
// Update the editor and the file title // Update the editor and the file title
var fileIndex = localStorage["file.current"]; var fileIndex = localStorage["file.current"];
$("#wmd-input").val(localStorage[fileIndex + ".content"]); $("#wmd-input").val(localStorage[fileIndex + ".content"]);
var title = localStorage[fileIndex + ".title"]; editor.refreshPreview();
$("#file-title").text(title); this.updateFileTitleUI();
$("#file-title-input").val(title);
}; };
fileManager.createFile = function(title) { fileManager.createFile = function(title) {
@ -83,18 +82,34 @@ var fileManager = (function($) {
var title = localStorage[fileIndex + ".title"]; var title = localStorage[fileIndex + ".title"];
if(title) { if(title) {
this.fileTitleList[i] = title; this.fileTitleList[i] = title;
}
}
};
fileManager.updateFileTitleUI = function() {
// Update the editor and the file title
var fileIndex = localStorage["file.current"];
var title = localStorage[fileIndex + ".title"];
$("#file-title").text(title);
$("#file-title-input").val(title);
$("#file-selector").empty();
for(var i=0; i<this.fileTitleList.length; i++) {
title = this.fileTitleList[i];
if(title) {
var fileIndex1 = "file." + i;
var a = $("<a>").text(title); var a = $("<a>").text(title);
var li = $("<li>").append(a); var li = $("<li>").append(a);
if(fileIndex == localStorage["file.current"]) { if(fileIndex1 == fileIndex) {
li.addClass("disabled"); li.addClass("disabled");
} }
else { else {
a.click((function(fileIndex) { a.attr("href", "javascript:void(0);")
.click((function(fileIndex) {
return function() { return function() {
localStorage["file.current"] = fileIndex; localStorage["file.current"] = fileIndex;
fileManager.selectFile(); fileManager.selectFile();
}; };
})(fileIndex)); })(fileIndex1));
} }
$("#file-selector").append(li); $("#file-selector").append(li);
} }
@ -180,12 +195,16 @@ var gdrive = (function($) {
return gdrive; return gdrive;
})(jQuery); })(jQuery);
var converter;
var editor;
(function($) { (function($) {
$(function() { $(function() {
var converter = Markdown.getSanitizingConverter(); converter = Markdown.getSanitizingConverter();
var editor = new Markdown.Editor(converter); editor = new Markdown.Editor(converter);
editor.run(); editor.run();
$(window).resize(resize); $(window).resize(resize);
resize(); resize();