mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2014-06-17 12:26:01 +02:00
parent 6fe42449dd 6bd322e195
commit c0047ebf97
10 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/plugin_api.inc.php
View File

@@ -95,7 +95,7 @@ function errorHandlerCreateDOM(htmlStr) {
case 'backend_save':
case 'backend_publish':
echo '<script>$(document).ready(function() { serendipity.eraseEntryEditorCache(); });</script>';
echo '<script>$(document).ready(function() { if(Modernizr.indexeddb) { serendipity.eraseEntryEditorCache(); } });</script>';
return true;
break;

2
templates/2k11/admin/index.tpl
View File

@@ -9,7 +9,7 @@
<!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file='admin/oldie.css'}">
<![endif]-->
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.1.min.js'}"></script>
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.2.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
<script src="{$head_link_script}"></script>

2
templates/2k11/admin/installer.inc.tpl
View File

@@ -9,7 +9,7 @@
<!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file='admin/oldie.css'}">
<![endif]-->
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.1.min.js'}"></script>
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.2.min.js'}"></script>
<script src="{serendipity_getFile file='jquery.js'}"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</head>

4
templates/2k11/admin/js/modernizr-2.8.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
templates/2k11/admin/js/modernizr-2.8.2.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
templates/2k11/admin/media_choose.tpl
View File

@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
{if $media.css}<link rel="stylesheet" href="{$media.css}">{/if}
{if $media.css_tree}<link rel="stylesheet" href="{$media.css_tree}">{/if}
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.1.min.js'}"></script>
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.2.min.js'}"></script>
<script src="{serendipity_getFile file='YahooUI/treeview/YAHOO.js'}"></script>
<script src="{serendipity_getFile file='YahooUI/treeview/treeview.js'}"></script>
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
@@ -31,7 +31,7 @@ if (parent.frames && parent.frames['tree']) {
</frameset>
</html>
{else}
<body id="{$media.body_id}">
<body id="serendipity_admin_page">
<div id="main" class="clearfix serendipityAdminContent">
{if $media.case == 'external'}

4
templates/2k11/admin/media_showitem.tpl
View File

@@ -7,9 +7,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{$media.css}">
<link rel="stylesheet" href="{$media.css_front}">
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.1.min.js'}"></script>
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.2.min.js'}"></script>
</head>
<body id="{$media.body_id}">
<body id="serendipity_admin_page">
{if $perm_denied}
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.PERM_DENIED}</span>
{else}

106
templates/2k11/admin/serendipity_editor.js.tpl
View File

@@ -661,64 +661,66 @@
}
}
serendipity.startEntryEditorCache = function() {
if ($('textarea[name="serendipity[body]"]').val() == "") {
serendipity.getCached("serendipity[body]", function(res) {
if (res && res != null && res != "null") {
$('textarea[name="serendipity[body]"]').text(res);
}
});
serendipity.getCached("serendipity[extended]", function(res) {
if (res && res != null && res != "null") {
if ($('textarea[name="serendipity[extended]"]').val() == "") {
$('textarea[name="serendipity[extended]"]').text(res);
if (! $('textarea[name="serendipity[extended]"]').is(':visible')) {
serendipity.toggle_extended();
if(Modernizr.indexeddb) {
serendipity.startEntryEditorCache = function() {
if ($('textarea[name="serendipity[body]"]').val() == "") {
serendipity.getCached("serendipity[body]", function(res) {
if (res && res != null && res != "null") {
$('textarea[name="serendipity[body]"]').text(res);
}
});
serendipity.getCached("serendipity[extended]", function(res) {
if (res && res != null && res != "null") {
if ($('textarea[name="serendipity[extended]"]').val() == "") {
$('textarea[name="serendipity[extended]"]').text(res);
if (! $('textarea[name="serendipity[extended]"]').is(':visible')) {
serendipity.toggle_extended();
}
}
}
}
});
}
$('textarea[name="serendipity[body]"]').one('keyup', function() {
setInterval(function() {
serendipity.cache("serendipity[body]", $('textarea[name="serendipity[body]"]').val())
}, 5000);
});
$('textarea[name="serendipity[extended]"]').one('keyup', function() {
setInterval(function() {
serendipity.cache("serendipity[extended]", $('textarea[name="serendipity[extended]"]').val());
}, 5000);
});
}
$('textarea[name="serendipity[body]"]').one('keyup', function() {
setInterval(function() {
serendipity.cache("serendipity[body]", $('textarea[name="serendipity[body]"]').val())
}, 5000);
});
$('textarea[name="serendipity[extended]"]').one('keyup', function() {
setInterval(function() {
serendipity.cache("serendipity[extended]", $('textarea[name="serendipity[extended]"]').val());
}, 5000);
});
}
serendipity.eraseEntryEditorCache = function() {
serendipity.cache("serendipity[body]", null);
serendipity.cache("serendipity[extended]", null);;
}
serendipity.eraseEntryEditorCache = function() {
serendipity.cache("serendipity[body]", null);
serendipity.cache("serendipity[extended]", null);;
}
var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
serendipity.cache = function (id, data) {
var request = indexedDB.open("cache", 1);
request.onupgradeneeded = function (event) {
event.target.result.createObjectStore("cache");
};
request.onsuccess = function(event) {
event.target.result.transaction(["cache"], 'readwrite').objectStore("cache").put(data, id);
};
}
serendipity.getCached = function(id, success) {
var request = indexedDB.open("cache", 1);
request.onupgradeneeded = function (event) {
event.target.result.createObjectStore("cache");
};
request.onsuccess = function(event) {
event.target.result.transaction(["cache"], 'readwrite').objectStore("cache").get(id).onsuccess = function (event) {
success(event.target.result);
serendipity.cache = function (id, data) {
var request = indexedDB.open("cache", 1);
request.onupgradeneeded = function (event) {
event.target.result.createObjectStore("cache");
};
};
request.onsuccess = function(event) {
event.target.result.transaction(["cache"], 'readwrite').objectStore("cache").put(data, id);
};
}
serendipity.getCached = function(id, success) {
var request = indexedDB.open("cache", 1);
request.onupgradeneeded = function (event) {
event.target.result.createObjectStore("cache");
};
request.onsuccess = function(event) {
event.target.result.transaction(["cache"], 'readwrite').objectStore("cache").get(id).onsuccess = function (event) {
success(event.target.result);
};
};
}
}
serendipity.toggle_collapsible = function(toggler, target, stateClass, stateIcon, stateOpen, stateClosed) {
@@ -1006,7 +1008,9 @@ $(function() {
if(!Modernizr.inputtypes.date) {
$('#serendipityNewTimestamp').val($('#serendipityNewTimestamp').val().replace("T", " "));
}
serendipity.startEntryEditorCache();
if(Modernizr.indexeddb) {
serendipity.startEntryEditorCache();
}
}
// Set entry timestamp

2
templates/2k11/admin/upgrader.inc.tpl
View File

@@ -9,7 +9,7 @@
<!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file='admin/oldie.css'}">
<![endif]-->
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.1.min.js'}"></script>
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.2.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$serendipityHTTPPath}{$templatePath}jquery.js"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>

12
templates/2k11/admin/wysiwyg_init.tpl
View File

@@ -48,11 +48,13 @@
on: {
instanceReady: function( evt ) {
CKEDITOR.instances["{$item}"].document.once('keyup', function() {
setInterval(function() {
serendipity.cache("{$item}", CKEDITOR.instances["{$item}"].getData());
}, 5000)
});
if(Modernizr.indexeddb) {
CKEDITOR.instances["{$item}"].document.once('keyup', function() {
setInterval(function() {
serendipity.cache("{$item}", CKEDITOR.instances["{$item}"].getData());
}, 5000)
});
}
}
},