Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch: packet 737 #737

Merged
merged 3 commits into from
Nov 5, 2022
Merged

patch: packet 737 #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45bc9ef
fix0511
maxgithubprofile Nov 5, 2022
ac531a4
Update app.js
maxgithubprofile Nov 5, 2022
6ffcb11
rm console.log
maxgithubprofile Nov 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 84 additions & 82 deletions chat/matrix-element.5.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.5.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.5.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.5.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions chat/matrix-element.6.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chat/matrix-element.6.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.6.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.6.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 48 additions & 60 deletions chat/matrix-element.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions chat/matrix-element.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions components/author/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,6 @@ var author = (function(){
hr : hr,
optimize : self.app.mobileview,
cancelsearch : function(){
console.log("clearsearch")
clearsearch()
},
renderclbk : function(){
Expand Down Expand Up @@ -1360,8 +1359,6 @@ var author = (function(){

author.address = address

console.log("GETSTATE")

/*self.sdk.ustate.get(author.address, function(){

})*/
Expand Down
4 changes: 0 additions & 4 deletions components/camerapreview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,6 @@ var camerapreview = (function(){

if(pid != libraryProcessId) return

console.log('photos', photos)

photos = photos.concat(result.library)

if(result.isLastChunk){
Expand Down Expand Up @@ -375,8 +373,6 @@ var camerapreview = (function(){
return Base64Helper.fromFile(data).then(base64 => {
images[id] = base64;

console.log('base64', base64)

resolve(images[id])
})

Expand Down
2 changes: 0 additions & 2 deletions components/donate/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ var donate = (function(){

ed = p.settings.essenseData;



self.sdk.users.get(ed.receiver, function(){

self.app.platform.sdk.node.transactions.get.allBalance(function (total) {
Expand Down
1 change: 0 additions & 1 deletion components/imagegallery/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ var imagegallery = (function(){
},

next : function(){
console.log("NEXT")
if(essenseData.images.length > 1){
actions.prepareImages();

Expand Down
5 changes: 0 additions & 5 deletions components/lenta/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2267,8 +2267,6 @@ var lenta = (function(){

var share = self.app.platform.sdk.node.shares.storage.trx[shareId];

console.log('share', share, shareId)

actions.recommendationinfo(share)

},
Expand Down Expand Up @@ -2454,7 +2452,6 @@ var lenta = (function(){

if(!essenseData.horizontal){

//console.log('loadedcachedHeight', loadedcachedHeight, cachedHeight, self.app.lastScrollTop+ self.app.height, document.body.scrollHeight - 2000)

if (
!loading && !ended &&
Expand Down Expand Up @@ -4371,8 +4368,6 @@ var lenta = (function(){

shares = [].concat(bshares, shares)

console.log('recommendations', recommendations, essenseData.includerec)

if(essenseData.includerec && !includingsub && !self.app.platform.sdk.categories.gettags().length){
shares = [].concat(recommendations, shares)

Expand Down
5 changes: 3 additions & 2 deletions components/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ var main = (function(){
addpanel : function(){

self.app.user.isState(function(state){
if(state){
if(state && el.addbutton){

if(state && !isMobile()){
el.addbutton.addClass('active')
Expand Down Expand Up @@ -1263,6 +1263,7 @@ var main = (function(){

destroy : function(){


showCategories(false)

delete self.app.events.scroll.main
Expand Down Expand Up @@ -1348,6 +1349,7 @@ var main = (function(){
})

}

},

showCategories : function(show){
Expand All @@ -1356,7 +1358,6 @@ var main = (function(){
},

init : function(p){


roller = null
lenta = null
Expand Down
4 changes: 0 additions & 4 deletions components/menu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ var menu = (function(){

var href = link.replace('https://', '').replace('http://', '').replace('bastyon://', '').replace('pocketnet/', '').replace('localhost/', '').replace('bastyon.com/', '').replace('pocketnet.app/', '')

console.log("HREF", href)

var p = {
href : href,
Expand Down Expand Up @@ -490,7 +489,6 @@ var menu = (function(){
el.find('.gotopage').on('click', function(){
var r = $(this).attr('link')

console.log("R", r)

searchlickaction(r)

Expand Down Expand Up @@ -856,8 +854,6 @@ var menu = (function(){

numberStep: function(now, tween) {

console.log('step')

var number = Number(value + now).toFixed(8),
target = $(tween.elem);

Expand Down
2 changes: 0 additions & 2 deletions components/mobilesearch/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ var mobilesearch = (function(){
var events = {
search : function(value){

console.log(value)

if (ed.events.search && value){

el.c.addClass('active')
Expand Down
1 change: 0 additions & 1 deletion components/navigation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ var navigation = (function(){

var back = self.app.nav.api.backChainGet()

console.log("k", k)

self.shell({
name : 'menu',
Expand Down
2 changes: 0 additions & 2 deletions components/navigation/templates/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

var ur = back.href;

console.log('ur', back)


%>

Expand Down
20 changes: 1 addition & 19 deletions components/post/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ var post = (function () {
init: ed.fromempty || false,
preview: true,
listpreview : false,

receiver: share.address,
fromtop: !ed.fromempty,
fromempty: ed.fromempty,
lastComment: ed.fromempty ? share.lastComment : null,
Expand Down Expand Up @@ -1247,7 +1247,6 @@ var post = (function () {

if(aspectRatio > 1.66) aspectRatio = 1.66

console.log("EL", el)

el.height( Math.min( 400, images.width() || self.app.width) * aspectRatio)
})
Expand Down Expand Up @@ -1315,7 +1314,6 @@ var post = (function () {
if (clbk) clbk();
}

console.log('share.settings.v', share.settings.v, image.images)

if(share.settings.v != 'a' && image.images.length > 1){

Expand All @@ -1341,7 +1339,6 @@ var post = (function () {

}
else{
console.log("HERE???")
images.addClass('manyImagesView')
isclbk()
/*images.isotope({
Expand Down Expand Up @@ -1989,20 +1986,7 @@ var post = (function () {


if (!share) {

share = self.app.platform.sdk.node.shares.getWithTemp(id)

/*var temp = _.find(self.sdk.node.transactions.temp.share, function (s) {
return s.txid == id
})

if (temp) {
share = new pShare();
share._import(temp, true);
share.temp = true;
share.address = self.app.platform.sdk.address.pnet().address
}*/

}

if (share) {
Expand Down Expand Up @@ -2182,8 +2166,6 @@ var post = (function () {

self.stop = function () {

console.log("????STOP???")

_.each(essenses, function (essense) {

if(!essense.pip){
Expand Down
8 changes: 0 additions & 8 deletions components/recommendationinfo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ var recommendationinfo = (function(){

_.each(data.tags, (t) => data.recmap[t] = true)

console.log('self.app.platform.sdk.tags.maxs()', self.app.platform.sdk.tags.maxs())

console.log('data', data)

self.shell({

Expand Down Expand Up @@ -136,11 +133,6 @@ var recommendationinfo = (function(){

ed = p.settings.essenseData

console.log("D", ed)




var data = {ed};

clbk(data);
Expand Down
7 changes: 0 additions & 7 deletions components/share/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,15 +879,11 @@ var share = (function(){

var SAVE = function(){

console.log("SAVE")

currentShare.language.set(self.app.localization.key)

actions.checktranscoding(function(result){
console.log("AS")
currentShare.uploadImages(self.app, function(){

console.log("AS2")

if (currentShare.hasexchangetag()){
currentShare.repost.v = ''
Expand Down Expand Up @@ -922,7 +918,6 @@ var share = (function(){

function(_alias, error){

console.log("ASD", error)

topPreloader(100)

Expand Down Expand Up @@ -1665,8 +1660,6 @@ var share = (function(){

action : function(file, clbk){

console.log("FILE", file)

if (file.ext == 'gif'){
imagesHelper.slowUploadGif(file, tstorage, clbk)
}
Expand Down
4 changes: 0 additions & 4 deletions components/slides/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ var slides = (function(){
var renders = {
lenta : function(txids, clbk){

console.log('txids', txids)

if(!txids.length){
if(clbk) clbk()
Expand Down Expand Up @@ -100,7 +99,6 @@ var slides = (function(){


if(_.toArray(rendered).length > maxshares && newshares.length > wshares){
console.log("CLEAR")
clear()
}

Expand All @@ -123,8 +121,6 @@ var slides = (function(){
total = _.uniq(total)


console.log("total", total)

return Promise.resolve()
})
}
Expand Down
Loading