Changed version minor to 2.2

This commit is contained in:
benweet 2013-10-13 00:36:45 +01:00
parent 3fada0c5e5
commit d56d21db47
10 changed files with 193 additions and 143 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "stackedit", "name": "stackedit",
"version": "2.1.7", "version": "2.2.0",
"description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.",
"dependencies": { "dependencies": {
"bootstrap": "3.0.0", "bootstrap": "3.0.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "stackedit", "name": "stackedit",
"version": "2.1.7", "version": "2.2.0",
"description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.",
"main": "res/main.js", "main": "res/main.js",
"directories": { "directories": {

View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
#Date Fri Oct 11 2013 22:46:08 #Date Sun Oct 13 2013 00:36:02
CACHE: CACHE:
index.html index.html

File diff suppressed because one or more lines are too long

View File

@ -1440,9 +1440,9 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo
.list-group-item.active:hover{background-color:#888888} .list-group-item.active:hover{background-color:#888888}
.move-to-front{z-index:1050 !important} .move-to-front{z-index:1050 !important}
.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s}
.btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-default:hover,.btn-default:focus,.btn-default:active{background-color:rgba(0,0,0,0.05)}
.btn-primary:hover{color:#ffffff;background-color:#747474} .btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#ffffff;background-color:#747474}
.btn-success:hover,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f0f3f4 !important} .btn-success:hover,.btn-success:focus,.btn-success:active,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f0f3f4 !important}
.btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px}
.form-inline .col-lg-1{width:8.333333333333332%} .form-inline .col-lg-1{width:8.333333333333332%}
.form-inline .col-lg-2{width:16.666666666666664%} .form-inline .col-lg-2{width:16.666666666666664%}

View File

@ -1440,9 +1440,9 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo
.list-group-item.active:hover{background-color:#888888} .list-group-item.active:hover{background-color:#888888}
.move-to-front{z-index:1050 !important} .move-to-front{z-index:1050 !important}
.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s}
.btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-default:hover,.btn-default:focus,.btn-default:active{background-color:rgba(0,0,0,0.05)}
.btn-primary:hover{color:#ffffff;background-color:#747474} .btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#ffffff;background-color:#747474}
.btn-success:hover,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f1f1f1 !important} .btn-success:hover,.btn-success:focus,.btn-success:active,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f1f1f1 !important}
.btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px}
.form-inline .col-lg-1{width:8.333333333333332%} .form-inline .col-lg-1{width:8.333333333333332%}
.form-inline .col-lg-2{width:16.666666666666664%} .form-inline .col-lg-2{width:16.666666666666664%}

View File

@ -1440,9 +1440,9 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo
.list-group-item.active:hover{background-color:#444444} .list-group-item.active:hover{background-color:#444444}
.move-to-front{z-index:1050 !important} .move-to-front{z-index:1050 !important}
.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s}
.btn-default:hover{background-color:rgba(255,255,255,0.08)} .btn-default:hover,.btn-default:focus,.btn-default:active{background-color:rgba(255,255,255,0.08)}
.btn-primary:hover{color:#ffffff;background-color:#585858} .btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#ffffff;background-color:#585858}
.btn-success:hover,.open .dropdown-toggle.btn-success{color:#dedede;background-color:#565656 !important} .btn-success:hover,.btn-success:focus,.btn-success:active,.open .dropdown-toggle.btn-success{color:#dedede;background-color:#565656 !important}
.btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px}
.form-inline .col-lg-1{width:8.333333333333332%} .form-inline .col-lg-1{width:8.333333333333332%}
.form-inline .col-lg-2{width:16.666666666666664%} .form-inline .col-lg-2{width:16.666666666666664%}

View File

@ -1440,9 +1440,9 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo
.list-group-item.active:hover{background-color:#888888} .list-group-item.active:hover{background-color:#888888}
.move-to-front{z-index:1050 !important} .move-to-front{z-index:1050 !important}
.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s}
.btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-default:hover,.btn-default:focus,.btn-default:active{background-color:rgba(0,0,0,0.05)}
.btn-primary:hover{color:#ffffff;background-color:#747474} .btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#ffffff;background-color:#747474}
.btn-success:hover,.open .dropdown-toggle.btn-success{color:#eeeeee;background-color:#406b5b !important} .btn-success:hover,.btn-success:focus,.btn-success:active,.open .dropdown-toggle.btn-success{color:#eeeeee;background-color:#406b5b !important}
.btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px}
.form-inline .col-lg-1{width:8.333333333333332%} .form-inline .col-lg-1{width:8.333333333333332%}
.form-inline .col-lg-2{width:16.666666666666664%} .form-inline .col-lg-2{width:16.666666666666664%}

View File

@ -1,4 +1,4 @@
var VERSION = "2.1.7"; var VERSION = "2.2.0";
var MAIN_URL = "https://stackedit.io/"; var MAIN_URL = "https://stackedit.io/";
var GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1"; var GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1";

View File

@ -826,18 +826,17 @@ define([
var reader = new FileReader(); var reader = new FileReader();
reader.onload = (function(importedFile) { reader.onload = (function(importedFile) {
return function(e) { return function(e) {
var content = e.target.result;
try { try {
newLocalStorage = JSON.parse(content); newLocalStorage = JSON.parse(e.target.result);
if(!newLocalStorage.version) { if(/^v/.test(newLocalStorage.version) === false) {
throw 1; throw 1;
} }
$('.modal-import-docs-settings').modal('show'); $('.modal-import-docs-settings').modal('show');
} }
catch(e) { catch(e) {
eventMgr.onError("Wrong format: " + importedFile.name); eventMgr.onError("Wrong format: " + importedFile.name);
return;
} }
$("#input-file-import-docs-settings").val('');
}; };
})(file); })(file);
reader.readAsText(file); reader.readAsText(file);