Permalink
Browse files

nicer partial hits, options page

  • Loading branch information...
1 parent e2dec99 commit 82d151ed254d0407b33a852d27a90709e86f5083 @shatting committed Jul 14, 2011
Showing with 118 additions and 28 deletions.
  1. +46 −2 README.md
  2. +18 −15 javascripts/popup.js
  3. +5 −1 stylesheets/autoSuggest.css
  4. +3 −1 stylesheets/options.css
  5. +46 −9 stylesheets/popup.css
View
@@ -1,5 +1,50 @@
CHANGELOG
===============
+2.0 _[July 15]_
+---------------
+- **markdown**: preview + toggle
+
+ _implemented_: local preview and server preview and toggle. the local preview does not support the _Markdown Extra_ extensions. the preview is maximizable by clicking on it. here is a good [markdown syntax guide](http://www.floatnotes.org/documentation/markdown-quickreference).
+
+ _planned_: editor support
+
+- **wikilinks**: clickable note links in notes.
+
+ _implemented_: create a link to a note by typing `#notetitle`.
+
+ _planned_: autocomplete
+
+- **checklists**: clickable checkboxes in notes.
+
+ _implemented_: notes tagged `Checklist` will show checkboxes. an unchecked item
+ is a line having a dash followed by a space (`'- '`) as first non-space characters.
+
+ > `- unchecked item`
+
+ a checked item has a asterisk followed by a space (`'* '`) as first non-space characters.
+
+ > `* checked item`
+
+ _planned_: support for other 3rd party checklist notation (listary, jadenote, ...)
+
+- some redesign, most notably the tab mode
+- lots of small fixes
+
+1.8.6.2 [July 2]
+---------------
+- improved startup, added inset shadows to editor and search field
+
+1.8.6 [July 1]
+---------------
+- bugfix release mostly
+- option for "font smoothing" (try this if the chosen font looks bad, useful mostly on OSes without built-in font smoothing (linux, win pre 7))
+
+1.8.4 [June 25]
+---------------
+- search now fuzzy, eg. you can type "smplnt" to find notes containing "simplenote"
+- click tags to edit them (just for that particular note though)
+- lots of smaller fixes
+
1.8.3 [June 17]
---------------
- tags autocomplete (the hover animation is a bit choppy - couldnt find the reason)
@@ -34,7 +79,6 @@ CHANGELOG
- bugfixes
1.7.1 [June 2]
-
----------------
- option: cascading context menus on/off (separate for pinned and others)
- right click context menu in index view: trash note
@@ -107,7 +151,7 @@ To open in tab, open a note and click the new "Popout" button. Will later integr
- added shortcuts. you can hover over an element (button, checkbox, text input field) to see its shortcut in the tooltip.
- added editor context menu (right click): insert tab url and search for selection.
-NOTICE: sadly, i had to add the new extension permission "tabs" for getting the tab url. the permission shows up as "browsing history" in the webstore. since the extension can only connect to the server "simple-note.appspot.com", and i am not in any way affiliated with this company, there is no way for me to get hold of that data, even if i wanted (which i dont).
+ _NOTICE: sadly, i had to add the new extension permission "tabs" for getting the tab url. the permission shows up as "browsing history" in the webstore. since the extension can only connect to the server "simple-note.appspot.com", and i am not in any way affiliated with this company, there is no way for me to get hold of that data, even if i wanted (which i dont)._
1.5.2 [May 1]
----------------
View
@@ -714,9 +714,7 @@ function displayStatusMessage(message) {
$("#index").show();
$('#notes').html(message);
- $('body').css("background","#fff");
- $("body").css("width", "400px");
- $("body").css("height", "150px");
+ $('body').addClass("message");
$('a').attr('target', '_blank').click(function() {window.close();});
}
@@ -1152,6 +1150,8 @@ function indexFillNoteReqComplete(note) {
//html = note.score + " - " + html;
if (note.score >= 1)
$noterow.addClass("fullhit")
+ if (note.score < 1)
+ $noterow.addClass("partialhit")
}
$noteheading.html(heading); // dont need more than 100 chars
if (headingtext.length > 25)
@@ -1324,7 +1324,7 @@ function SNEditor() {
$("#cmwrapper").css("height","");
$("#cmiframe").attr("tabindex","2");
$("#cmwrapper").append("<div id='markdownpreviewspacer'></div>");
- $("#cmwrapper").append("<div id='markdownpreview'></div>");
+ $("#cmwrapper").append("<div id='markdownpreview'><span id='info'></span></div>");
this.dirty={content: false, tags: false, pinned: false};
}
@@ -1950,6 +1950,7 @@ SNEditor.prototype.setNote = function(note, options) {
this.setPintoggle(this.note.systemtags.indexOf("pinned")>=0);
// set markdown
+ this.clearMarkdown();
this.setMarkdownToggle(this.note.systemtags.indexOf("markdown") >= 0);
this.updateMarkdown();
@@ -2058,7 +2059,7 @@ SNEditor.prototype.saveNote = function(callback) {
that.note = note;
that.clearDirty();
}
- if (that.note.key == "") {
+ if (that.note && that.note.key == "") {
}
log("CodeMirror.saveNote: request complete");
@@ -2357,13 +2358,13 @@ SNEditor.prototype.updateMarkdown = function(input,nocache) {
this.setMarkdownHtml(snEditor.markupCache[key].html, server, serverTitle)
} else {
- $("#markdownpreview").addClass("loading");
- $("#markdownpreview").html("<span id='info'>loading..</span>");
+ //$("#markdownpreview").addClass("loading");
$("#markdownpreview #info").css("right", (cssprop("#note","right") + 35) + "px");
-
+ $("#markdownpreview #info").addClass("loading");
+
$.ajax({
url: "https://simple-note.appspot.com/markdown/" + key + "/" + version,
- timeout: 3000,
+ timeout: 5000,
complete : function(jqXHR, textStatus) {
if (textStatus == "success") {
if (!snEditor.markupCache)
@@ -2379,14 +2380,19 @@ SNEditor.prototype.updateMarkdown = function(input,nocache) {
var converter = new Showdown.converter();
snEditor.setMarkdownHtml(converter.makeHtml(snEditor.codeMirror.getCode()), local + " (" + textStatus + ")", "Server error, using local preview.");
}
- $("#markdownpreview").removeClass("loading");
+ //$("#markdownpreview").removeClass("loading");
+ $("#markdownpreview #info").removeClass("loading");
}
});
}
}
}
+SNEditor.prototype.clearMarkdown = function() {
+ $("#markdownpreview").html("<span id='info'></span>");
+}
+
SNEditor.prototype.setMarkdownHtml = function(html, info, moreinfo) {
$("#markdownpreview").html("<span id='info'>" + info + "</span>" + html);
if (moreinfo) {
@@ -2417,15 +2423,12 @@ SNEditor.prototype.print = function() {
SNEditor.prototype.showRevert = function() {
if (!extData.isTab)
- $('div#note #revert').show();
- //alert($('div#note #pintoggle').css("left"))
- //$('div#note #tags').animate({right:"+=28"});
+ $('div#note #revert').show();
this.adjustTagsWidth();
}
SNEditor.prototype.hideRevert = function() {
- $('div#note #revert').hide();
- //$('div#note #tags').animate({right:"-=28"});
+ $('div#note #revert').hide();
this.adjustTagsWidth();
}
@@ -7,13 +7,17 @@ ul.as-selections {
position: absolute;
display: inline;
right: 240px;
- left: 10px;
+ left: 5px;
font-size: 13px;
padding-left: 0px;
color: #333;
cursor: text;
}
+.tab ul.as-selections {
+ left: 10px;
+}
+
/*ul.as-selections:focus {
-webkit-box-shadow: 0 0 3px #3c7ecf;
border: 1px solid #666;
View
@@ -68,10 +68,12 @@ a, a:visited {
font-size: 18px;
border-radius:4px;
background:#EEE;
+ background: -webkit-linear-gradient(left, white 70%, #F6F6F9 90%, #EDEDF3);
+
margin:7px 0;
padding:2px 2px 5px 6px;
padding:6px;
- -webkit-box-shadow: 1px 10px 5px rgba(0,0,0,0.3);
+ -webkit-box-shadow: 6px 10px 5px -4px rgba(0, 0, 0, 0.3);
border-top: 1px solid #FFF;
}
.optionheading {
View
@@ -9,6 +9,13 @@ body {
background: white;
}
+
+body.message {
+ width: 400px;
+ height: 106px;
+}
+
+
body.tab {
background-image: url(/images/texture.png);
background: #4F4F59;
@@ -72,6 +79,7 @@ div#note {
padding: 2px;
border: 1px solid #EDEDF3;
background: -webkit-linear-gradient(right, white 70%, #F6F6F9 90%, #EDEDF3);
+ background: -webkit-linear-gradient(right, #EDEDF3, #F6F6F9 10%, white 70%, #F6F6F9 90%, #EDEDF3);
box-shadow: 8px 10px 8px -5px rgba(0, 0, 0, 0.8);
border-radius: 12px 2px 0px 2px;
}
@@ -115,6 +123,10 @@ div#notes {
border-left: 1px solid #999;;
}
+.message div#notes {
+ padding-left: 14px;
+}
+
div#statusbar {
position: absolute;
bottom: 0px;
@@ -206,8 +218,8 @@ div#statusbar {
#q {
padding: 4px 6px 4px 24px;
font-size: 13px;
- width: 197px;
- margin-left: 4px;
+ width: 201px;
+ margin-left: 3px;
background: transparent url(/images/searchfield.png) no-repeat 6px 50%;
box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 2px inset;
-webkit-transition: background-color 0.4s ease-in-out;
@@ -257,7 +269,7 @@ div.noterow {
cursor:pointer;
- -webkit-box-shadow: 4px 4px 3px -4px #333;
+ box-shadow: 4px 4px 3px -4px rgba(0, 0, 0, 0.2);
-webkit-transition: all 70ms ease-in-out;
margin-right: 4px;
@@ -267,10 +279,10 @@ div.noterow {
padding-right: 5px;
background: white;
cursor: pointer;
- border: 1px solid #CCC;
+ border: 1px solid #AAA;
-webkit-transition: all 70ms ease-in-out;
border-left: 4px solid #aaa;
- border-radius: 0px 3px 3px 0px;
+ ''border-radius: 0px 3px 3px 0px;
margin-left: -3px;
}
@@ -313,7 +325,11 @@ div.selectednote:hover {
}
div.fullhit {
- border: 1px dashed green;
+
+}
+
+div.partialhit {
+ opacity: 0.5;
}
/* noterow children */
@@ -328,7 +344,7 @@ div.noteheading, div.abstract {
-webkit-transition: all 70ms ease-in-out;
}
-div.noteheading { color:#111;}
+div.noteheading { color:#333;}
div.noterowdeleted div.noteheading { color:#666;}
div.abstract {
@@ -448,6 +464,17 @@ div.statusicon-clickable:hover {
border-radius: 12px 0px 0px 0px;
border: 1px solid #999;
margin-top: 2px;
+ position: absolute;
+ bottom: 2px;
+ top: 32px;
+ right: 2px;
+ left: 5px;
+}
+
+.tab #cmwrapper {
+ border-radius: 12px 0px 0px 0px;
+ border: 1px solid #999;
+ margin-top: 2px;
position: absolute;
bottom: 10px;
top: 32px;
@@ -604,6 +631,11 @@ div.statusicon-clickable:hover {
border: 1px solid #EDEDF3;
}
+#markdownpreview #info.loading {
+ background: transparent url(/images/loader_small.gif) no-repeat 50%;
+ width: 18px;
+}
+
div#note .toolbarbutton {
display:inline;
margin-top: 1px;
@@ -635,7 +667,11 @@ div#note .toolbarbutton {
}
#print {
- background-image:url(/images/print.png);
+ background-image:url(/images/print.png);
+}
+
+.tab #print {
+ margin-left: 15px;
}
#popout {
@@ -680,12 +716,13 @@ div#note .toolbarbutton {
#backtoindex {
background-image:url(/images/back.png);
- margin-right: 7px !important;
+ margin-right: 0px !important;
}
.tab #backtoindex {
background-image:url(/images/close.png);
margin-right: 7px !important;
+ margin-left: 15px;
}
.tooltip {

0 comments on commit 82d151e

Please sign in to comment.