Skip to content

Commit

Permalink
Merge pull request #198 from rupok/development
Browse files Browse the repository at this point in the history 
Post Grid Notice Issue Fix
  • Loading branch information
@rupok
rupok authored Feb 28, 2019
2 parents 291b621 + dd8a5e7 commit ecf7edd
Show file tree
Hide file tree
Showing 15 changed files with 114 additions and 1,402 deletions.
32 changes: 0 additions & 32 deletions admin/assets/js/rollback-admin.js
View file

This file was deleted.

5 changes: 0 additions & 5 deletions admin/partials/elements.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@
<label for="twitter-feed"></label>
<p class="eael-el-title"><?php _e( 'Twitter Feed', 'essential-addons-elementor' ) ?></p>
</div>
<div class="eael-checkbox">
<input type="checkbox" id="facebook-feed" name="facebook-feed" <?php checked( 1, $this->eael_get_settings['facebook-feed'], true ); ?> >
<label for="facebook-feed"></label>
<p class="eael-el-title"><?php _e( 'Facebook Feed', 'essential-addons-elementor' ) ?></p>
</div>
<div class="eael-checkbox">
<input type="checkbox" id="filter-gallery" name="filter-gallery" <?php checked( 1, $this->eael_get_settings['filter-gallery'], true ); ?> >
<label for="filter-gallery"></label>
Expand Down
54 changes: 0 additions & 54 deletions admin/partials/version-control.php
View file

This file was deleted.

4 changes: 1 addition & 3 deletions admin/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Eael_Admin_Settings {
* @var array
* @since 2.3.0
*/
public $eael_default_keys = [ 'contact-form-7', 'count-down', 'creative-btn', 'fancy-text', 'interactive-promo', 'post-grid', 'post-block', 'post-timeline', 'product-grid', 'team-members', 'testimonials', 'weforms', 'call-to-action', 'flip-box', 'info-box', 'dual-header', 'price-table','ninja-form', 'gravity-form', 'caldera-form', 'wpforms', 'twitter-feed', 'facebook-feed', 'data-table', 'filter-gallery', 'image-accordion', 'content-ticker', 'tooltip', 'adv-accordion', 'adv-tabs', 'progress-bar', 'section-particles'];
public $eael_default_keys = [ 'contact-form-7', 'count-down', 'creative-btn', 'fancy-text', 'post-grid', 'post-timeline', 'product-grid', 'team-members', 'testimonials', 'weforms', 'call-to-action', 'flip-box', 'info-box', 'dual-header', 'price-table', 'ninja-form', 'gravity-form', 'caldera-form', 'wpforms', 'twitter-feed', 'data-table', 'filter-gallery', 'image-accordion','content-ticker', 'tooltip', 'adv-accordion', 'adv-tabs', 'progress-bar', 'section-particles', 'feature-list'];

/**
* Will Contain All Components Default Values
Expand Down Expand Up @@ -177,14 +177,12 @@ public function eael_admin_settings_page() {
<li><a href="#general" class="active"><img src="<?php echo plugins_url( '/', __FILE__ ).'assets/images/icon-settings.svg'; ?>"><span>General</span></a></li>
<li><a href="#elements"><img src="<?php echo plugins_url( '/', __FILE__ ).'assets/images/icon-modules.svg'; ?>"><span>Elements</span></a></li>
<li><a href="#extensions"><img src="<?php echo plugins_url( '/', __FILE__ ).'assets/images/icon-extensions.svg'; ?>"><span>Extensions</span></a></li>
<li><a href="#version-control"><img src="<?php echo plugins_url( '/', __FILE__ ).'assets/images/icon-version-control.svg'; ?>"><span>Version Control</span></a></li>
<li><a href="#go-pro"><img src="<?php echo plugins_url( '/', __FILE__ ).'assets/images/icon-upgrade.svg'; ?>"><span>Go Premium</span></a></li>
</ul>
<?php
include('partials/general.php');
include('partials/elements.php');
include('partials/extensions.php');
include('partials/version-control.php');
include('partials/go-pro.php');
?>
</div>
Expand Down
13 changes: 3 additions & 10 deletions assets/css/essential-addons-elementor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4333,10 +4333,6 @@ div.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow {
background-color: red !important;
}

.eael-facebook-feed-wrapper::before,
.eael-facebook-feed-wrapper::after,
.eael-facebook-feed-container::before,
.eael-facebook-feed-container::after,
.eael-twitter-feed-wrapper::before,
.eael-twitter-feed-wrapper::after,
.eael-twitter-feed-container::before,
Expand Down Expand Up @@ -4607,8 +4603,7 @@ div.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow {
}

/*--- Masonry View ---*/
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 33.33%;
margin-top: 0px;
float: left;
Expand All @@ -4635,14 +4630,12 @@ div.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow {

/*--- Media Query ---*/
@media only screen and (min-width: 768px) and (max-width: 992px) {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 50% !important;
}
}
@media only screen and (max-width: 480px) {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 100% !important;
}
}
Expand Down
81 changes: 0 additions & 81 deletions assets/js/eael-scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,86 +115,6 @@

}



var FacebookFeedHandler = function ($scope, $) {
var loadingFeed = $scope.find( '.eael-loading-feed' );
var $fbCarousel = $scope.find('.eael-facebook-feed-layout-wrapper').eq(0),
$name = ($fbCarousel.data("facebook-feed-ac-name") !== undefined) ? $fbCarousel.data("facebook-feed-ac-name") : '',
$limit = ($fbCarousel.data("facebook-feed-post-limit") !== undefined) ? $fbCarousel.data("facebook-feed-post-limit") : '',
$app_id = ($fbCarousel.data("facebook-feed-app-id") !== undefined) ? $fbCarousel.data("facebook-feed-app-id") : '',
$app_secret = ($fbCarousel.data("facebook-feed-app-secret") !== undefined) ? $fbCarousel.data("facebook-feed-app-secret") : '',
$length = ($fbCarousel.data("facebook-feed-content-length") !== undefined) ? $fbCarousel.data("facebook-feed-content-length") : 400,
$media = ($fbCarousel.data("facebook-feed-media") !== undefined) ? $fbCarousel.data("facebook-feed-media") : false,
$feed_type = ($fbCarousel.data("facebook-feed-type") !== undefined) ? $fbCarousel.data("facebook-feed-type") : false,
$carouselId = ($fbCarousel.data("facebook-feed-id") !== undefined) ? $fbCarousel.data("facebook-feed-id") : ' ';
// Facebook Feed Init
function eael_facebook_feeds() {
var $access_token = ($app_id+'|'+$app_secret).toString();
var $id_name = $name.toString();
$( '#eael-facebook-feed-'+ $carouselId +'.eael-facebook-feed-layout-container' ).socialfeed({

facebook:{
accounts:[$id_name],
limit: $limit,
access_token: $access_token
},

// GENERAL SETTINGS
length: $length,
show_media: $media,
template_html: '<div class="eael-social-feed-element {{? !it.moderation_passed}}hidden{{?}}" dt-create="{{=it.dt_create}}\" social-feed-id = "{{=it.id}}">\
{{=it.attachment}}\
<div class="eael-content">\
<a class="pull-left auth-img" href="{{=it.author_link}}" target="_blank">\
<img class="media-object" src="{{=it.author_picture}}">\
</a>\
<div class="media-body">\
<p>\
<i class="fa fa-{{=it.social_network}} social-feed-icon"></i>\
<span class="author-title">{{=it.author_name}}</span>\
<span class="muted pull-right social-feed-date"> {{=it.time_ago}}</span>\
</p>\
<div class="text-wrapper">\
<p class="social-feed-text">{{=it.text}} </p>\
<p><a href="{{=it.link}}" target="_blank" class="read-more-link">Read More</a></p>\
</div>\
</div>\
</div>\
</div>',
});
}

// Facebook Feed Masonry View
function eael_facebook_feed_masonry() {
$('.eael-facebook-feed-layout-container.masonry-view').masonry({
itemSelector: '.eael-social-feed-element',
percentPosition: true,
columnWidth: '.eael-social-feed-element'
});
}

$.ajax({
url: eael_facebook_feeds(),
beforeSend: function() {
loadingFeed.addClass( 'show-loading' );
},
success: function() {
if($feed_type == 'masonry') {
setTimeout(function() {
eael_facebook_feed_masonry();
}, 2000);

}
loadingFeed.removeClass( 'show-loading' );
},
error: function() {
console.log('error loading');
}
});


};


var TwitterFeedHandler = function ($scope, $) {
Expand Down Expand Up @@ -738,7 +658,6 @@
elementorFrontend.hooks.addAction('frontend/element_ready/eael-adv-accordion.default', AdvAccordionHandler);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-pricing-table.default', PricingTooltip);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-post-timeline.default', postTimelineHandler);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-facebook-feed.default', FacebookFeedHandler);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-twitter-feed.default', TwitterFeedHandler);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-content-ticker.default', ContentTicker);
elementorFrontend.hooks.addAction('frontend/element_ready/eael-data-table.default', dataTable);
Expand Down
13 changes: 3 additions & 10 deletions assets/sass/_social-feeds.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
background-color: red !important;
}

.eael-facebook-feed-wrapper::before,
.eael-facebook-feed-wrapper::after,
.eael-facebook-feed-container::before,
.eael-facebook-feed-container::after,
.eael-twitter-feed-wrapper::before,
.eael-twitter-feed-wrapper::after,
.eael-twitter-feed-container::before,
Expand Down Expand Up @@ -268,8 +264,7 @@
}

/*--- Masonry View ---*/
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 33.33%;
margin-top: 0px;
float: left;
Expand All @@ -294,15 +289,13 @@

/*--- Media Query ---*/
@media only screen and ( min-width: 768px) and (max-width: 992px) {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 50% !important;
}
}

@media only screen and (max-width: 480px) {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element,
.eael-facebook-feed-container.masonry-view .eael-social-feed-element {
.eael-twitter-feed-container.masonry-view .eael-social-feed-element {
width: 100% !important;
}
}
Loading

0 comments on commit ecf7edd

Please sign in to comment.