compatibility with the libreJS plugin
This commit is contained in:
parent
a6618b8dcc
commit
a016241dea
|
@ -168,7 +168,32 @@ class QvitterAction extends ApiAction
|
|||
|
||||
|
||||
|
||||
?><script>
|
||||
?>
|
||||
<script>
|
||||
|
||||
/*
|
||||
@licstart The following is the entire license notice for the
|
||||
JavaScript code in this page.
|
||||
|
||||
Copyright (C) 2015 Hannes Mannerheim and other contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as
|
||||
published by the Free Software Foundation, either version 3 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@licend The above is the entire license notice
|
||||
for the JavaScript code in this page.
|
||||
*/
|
||||
|
||||
window.defaultAvatarStreamSize = <?php print json_encode(Avatar::defaultImage(AVATAR_STREAM_SIZE)) ?>;
|
||||
window.textLimit = <?php print json_encode((int)common_config('site','textlimit')) ?>;
|
||||
window.registrationsClosed = <?php print json_encode($registrationsclosed) ?>;
|
||||
|
@ -487,12 +512,12 @@ class QvitterAction extends ApiAction
|
|||
|
||||
<div id="footer"><div id="footer-spinner-container"></div></div>
|
||||
</div>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-2.1.3.min.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-ui-1.10.3.min.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.minicolors.min.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.jWindowCrop.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/load-image.min.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/xregexp-all-min-2.0.0.js"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-2.1.4.min.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/jquery-2.1.4.min.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-ui-1.10.3.min.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/jquery-ui-1.10.3.min.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.minicolors.min.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/jquery.minicolors.min.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.jWindowCrop.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/jquery.jWindowCrop.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/load-image.min.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/load-image.min.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/xregexp-all-min-2.0.0.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/lib/xregexp-all-min-2.0.0.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/dom-functions.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/dom-functions.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/misc-functions.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/misc-functions.js')); ?>"></script>
|
||||
<script type="text/javascript" src="<?php print $qvitterpath; ?>js/ajax-functions.js?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/js/ajax-functions.js')); ?>"></script>
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
|
||||
/* · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
/*· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
· ·
|
||||
· ·
|
||||
· Q V I T T E R ·
|
||||
· ·
|
||||
· http://github.com/hannesmannerheim/qvitter ·
|
||||
· ·
|
||||
· ·
|
||||
· <o) ·
|
||||
· /_//// ·
|
||||
|
@ -15,23 +13,30 @@
|
|||
· \\) \____) ·
|
||||
· ·
|
||||
· ·
|
||||
· @licstart The following is the entire license notice for the ·
|
||||
· JavaScript code in this page. ·
|
||||
· ·
|
||||
· Qvitter is free software: you can redistribute it and / or modify it ·
|
||||
· under the terms of the GNU Affero General Public License as published by ·
|
||||
· the Free Software Foundation, either version three of the License or (at ·
|
||||
· your option) any later version. ·
|
||||
· Copyright (C) 2015 Hannes Mannerheim and other contributors ·
|
||||
· ·
|
||||
· Qvitter is distributed in hope that it will be useful but WITHOUT ANY ·
|
||||
· WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS ·
|
||||
· FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for ·
|
||||
· more details. ·
|
||||
· ·
|
||||
· This program is free software: you can redistribute it and/or modify ·
|
||||
· it under the terms of the GNU Affero General Public License as ·
|
||||
· published by the Free Software Foundation, either version 3 of the ·
|
||||
· License, or (at your option) any later version. ·
|
||||
· ·
|
||||
· This program is distributed in the hope that it will be useful, ·
|
||||
· but WITHOUT ANY WARRANTY; without even the implied warranty of ·
|
||||
· MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ·
|
||||
· GNU Affero General Public License for more details. ·
|
||||
· ·
|
||||
· You should have received a copy of the GNU Affero General Public License ·
|
||||
· along with Qvitter. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· along with this program. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· ·
|
||||
· Contact h@nnesmannerhe.im if you have any questions. ·
|
||||
· @licend The above is the entire license notice ·
|
||||
· for the JavaScript code in this page. ·
|
||||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
|
||||
/* ·
|
||||
·
|
||||
|
@ -99,7 +104,7 @@ function checkLogin(username,password,actionOnSuccess) {
|
|||
password: password
|
||||
},
|
||||
dataType: 'json',
|
||||
error: function() {
|
||||
error: function() {
|
||||
logoutWithoutReload(true);
|
||||
},
|
||||
success: function(data) {
|
||||
|
@ -395,4 +400,3 @@ function getFavsAndRequeetsForQueet(q,qid) {
|
|||
}
|
||||
});
|
||||
}
|
||||
showFavsAndRequeetsInQueet
|
|
@ -1,11 +1,9 @@
|
|||
|
||||
/* · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
/*· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
· ·
|
||||
· ·
|
||||
· Q V I T T E R ·
|
||||
· ·
|
||||
· http://github.com/hannesmannerheim/qvitter ·
|
||||
· ·
|
||||
· ·
|
||||
· <o) ·
|
||||
· /_//// ·
|
||||
|
@ -15,23 +13,29 @@
|
|||
· \\) \____) ·
|
||||
· ·
|
||||
· ·
|
||||
· @licstart The following is the entire license notice for the ·
|
||||
· JavaScript code in this page. ·
|
||||
· ·
|
||||
· Qvitter is free software: you can redistribute it and / or modify it ·
|
||||
· under the terms of the GNU Affero General Public License as published by ·
|
||||
· the Free Software Foundation, either version three of the License or (at ·
|
||||
· your option) any later version. ·
|
||||
· Copyright (C) 2015 Hannes Mannerheim and other contributors ·
|
||||
· ·
|
||||
· Qvitter is distributed in hope that it will be useful but WITHOUT ANY ·
|
||||
· WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS ·
|
||||
· FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for ·
|
||||
· more details. ·
|
||||
· ·
|
||||
· This program is free software: you can redistribute it and/or modify ·
|
||||
· it under the terms of the GNU Affero General Public License as ·
|
||||
· published by the Free Software Foundation, either version 3 of the ·
|
||||
· License, or (at your option) any later version. ·
|
||||
· ·
|
||||
· This program is distributed in the hope that it will be useful, ·
|
||||
· but WITHOUT ANY WARRANTY; without even the implied warranty of ·
|
||||
· MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ·
|
||||
· GNU Affero General Public License for more details. ·
|
||||
· ·
|
||||
· You should have received a copy of the GNU Affero General Public License ·
|
||||
· along with Qvitter. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· along with this program. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· ·
|
||||
· Contact h@nnesmannerhe.im if you have any questions. ·
|
||||
· @licend The above is the entire license notice ·
|
||||
· for the JavaScript code in this page. ·
|
||||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
|
||||
/* ·
|
||||
|
@ -559,7 +563,7 @@ function addStreamToHistoryMenuAndMarkAsCurrent(streamHeader, defaultStreamName)
|
|||
|
||||
if($('.stream-selection[data-stream-header="' + streamHeader + '"]').length==0
|
||||
&& streamHeader != '@' + window.loggedIn.screen_name
|
||||
&& typeof window.loggedIn.screen_name != 'undefined') {
|
||||
&& typeof window.loggedIn.screen_name != 'undefined') {
|
||||
$('#history-container').append('<a class="stream-selection" data-stream-header="' + streamHeader + '" href="' + window.siteInstanceURL + convertStreamToPath(defaultStreamName) + '">' + streamHeader + '<i class="chev-right"></i></a>');
|
||||
updateHistoryLocalStorage();
|
||||
}
|
||||
|
|
4
js/lib/jquery-2.1.3.min.js
vendored
4
js/lib/jquery-2.1.3.min.js
vendored
File diff suppressed because one or more lines are too long
35
js/lib/jquery-2.1.4.min.js
vendored
Normal file
35
js/lib/jquery-2.1.4.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
35
js/lib/jquery-ui-1.10.3.min.js
vendored
35
js/lib/jquery-ui-1.10.3.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,10 +1,33 @@
|
|||
/*
|
||||
* jWindowCrop v1.0.0
|
||||
*
|
||||
* Copyright (c) 2012 Tyler Brown
|
||||
* Licensed under the MIT license.
|
||||
*
|
||||
*/
|
||||
|
||||
@licstart The following is the entire license notice for the
|
||||
JavaScript code in this page.
|
||||
|
||||
Copyright (c) 2012 Tyler Brown
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
@licend The above is the entire license notice
|
||||
for the JavaScript code in this page.
|
||||
|
||||
*/
|
||||
|
||||
(function($){
|
||||
function fillContainer(val, targetLength, containerLength) { // ensure that no gaps are between target's edges and container's edges
|
||||
|
|
38
js/lib/jquery.minicolors.min.js
vendored
38
js/lib/jquery.minicolors.min.js
vendored
File diff suppressed because one or more lines are too long
31
js/lib/load-image.min.js
vendored
31
js/lib/load-image.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,11 +1,9 @@
|
|||
|
||||
/* · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
/*· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
· ·
|
||||
· ·
|
||||
· Q V I T T E R ·
|
||||
· ·
|
||||
· http://github.com/hannesmannerheim/qvitter ·
|
||||
· ·
|
||||
· ·
|
||||
· <o) ·
|
||||
· /_//// ·
|
||||
|
@ -15,23 +13,30 @@
|
|||
· \\) \____) ·
|
||||
· ·
|
||||
· ·
|
||||
· @licstart The following is the entire license notice for the ·
|
||||
· JavaScript code in this page. ·
|
||||
· ·
|
||||
· Qvitter is free software: you can redistribute it and / or modify it ·
|
||||
· under the terms of the GNU Affero General Public License as published by ·
|
||||
· the Free Software Foundation, either version three of the License or (at ·
|
||||
· your option) any later version. ·
|
||||
· Copyright (C) 2015 Hannes Mannerheim and other contributors ·
|
||||
· ·
|
||||
· Qvitter is distributed in hope that it will be useful but WITHOUT ANY ·
|
||||
· WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS ·
|
||||
· FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for ·
|
||||
· more details. ·
|
||||
· ·
|
||||
· This program is free software: you can redistribute it and/or modify ·
|
||||
· it under the terms of the GNU Affero General Public License as ·
|
||||
· published by the Free Software Foundation, either version 3 of the ·
|
||||
· License, or (at your option) any later version. ·
|
||||
· ·
|
||||
· This program is distributed in the hope that it will be useful, ·
|
||||
· but WITHOUT ANY WARRANTY; without even the implied warranty of ·
|
||||
· MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ·
|
||||
· GNU Affero General Public License for more details. ·
|
||||
· ·
|
||||
· You should have received a copy of the GNU Affero General Public License ·
|
||||
· along with Qvitter. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· along with this program. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· ·
|
||||
· Contact h@nnesmannerhe.im if you have any questions. ·
|
||||
· @licend The above is the entire license notice ·
|
||||
· for the JavaScript code in this page. ·
|
||||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
|
||||
|
||||
/* ·
|
||||
|
@ -1198,5 +1203,3 @@ function theUserOrGroupThisStreamBelongsTo(stream) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
|
||||
/* · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
/*· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
|
||||
· ·
|
||||
· ·
|
||||
· Q V I T T E R ·
|
||||
· ·
|
||||
· http://github.com/hannesmannerheim/qvitter ·
|
||||
· ·
|
||||
· ·
|
||||
· <o) ·
|
||||
· /_//// ·
|
||||
|
@ -15,23 +13,29 @@
|
|||
· \\) \____) ·
|
||||
· ·
|
||||
· ·
|
||||
· @licstart The following is the entire license notice for the ·
|
||||
· JavaScript code in this page. ·
|
||||
· ·
|
||||
· Qvitter is free software: you can redistribute it and / or modify it ·
|
||||
· under the terms of the GNU Affero General Public License as published by ·
|
||||
· the Free Software Foundation, either version three of the License or (at ·
|
||||
· your option) any later version. ·
|
||||
· Copyright (C) 2015 Hannes Mannerheim and other contributors ·
|
||||
· ·
|
||||
· Qvitter is distributed in hope that it will be useful but WITHOUT ANY ·
|
||||
· WARRANTY; without even the implied warranty of MERCHANTABILTY or FITNESS ·
|
||||
· FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for ·
|
||||
· more details. ·
|
||||
· ·
|
||||
· This program is free software: you can redistribute it and/or modify ·
|
||||
· it under the terms of the GNU Affero General Public License as ·
|
||||
· published by the Free Software Foundation, either version 3 of the ·
|
||||
· License, or (at your option) any later version. ·
|
||||
· ·
|
||||
· This program is distributed in the hope that it will be useful, ·
|
||||
· but WITHOUT ANY WARRANTY; without even the implied warranty of ·
|
||||
· MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ·
|
||||
· GNU Affero General Public License for more details. ·
|
||||
· ·
|
||||
· You should have received a copy of the GNU Affero General Public License ·
|
||||
· along with Qvitter. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· along with this program. If not, see <http://www.gnu.org/licenses/>. ·
|
||||
· ·
|
||||
· Contact h@nnesmannerhe.im if you have any questions. ·
|
||||
· @licend The above is the entire license notice ·
|
||||
· for the JavaScript code in this page. ·
|
||||
· ·
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
|
||||
|
||||
// object to keep old states of streams in, to speed up stream change
|
||||
window.oldStreams = new Object();
|
||||
|
@ -1978,7 +1982,7 @@ $('body').on('mouseup', 'div.syntax-two', function(e){
|
|||
});
|
||||
|
||||
// strip html from paste
|
||||
function stripHtmlFromPaste(e) {
|
||||
function stripHtmlFromPaste(e) {
|
||||
e.preventDefault();
|
||||
var text = replaceHtmlSpecialChars(e.clipboardData.getData("text/plain"));
|
||||
text = text.replace(/\n/g,'<br>').replace(/\t/g, ' '); // keep line-breaks and tabs
|
||||
|
|
Loading…
Reference in New Issue
Block a user