Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion assets/admin/js/tooltipster/tooltipster.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* A rockin' custom tooltip jQuery plugin
* Developed by Caleb Jacob and Louis Ameline
* MIT license
*
* Fork: data-tooltip-content uses $(document).find() so the attribute is
* never passed to $() as HTML (CodeQL js/xss-through-dom).
*/
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
Expand Down Expand Up @@ -535,7 +538,7 @@ $.Tooltipster.prototype = {
$el;

if (selector){
$el = $(selector);
$el = $(document).find(selector);
}

if ($el && $el[0]) {
Expand Down
3 changes: 1 addition & 2 deletions assets/admin/js/tooltipster/tooltipster.bundle.min.js

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions cooked.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ final class Cooked_Plugin {
*/
public $extra;

/**
* Cooked Pixwell Theme Support Object.
*
* @var object|Cooked_Pixwell
* @since 1.16.0
*/
public $pixwell;

/**
* Main Cooked_Plugin Instance.
*
Expand Down
12 changes: 10 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ function jsFotorama() {
.pipe(dest('assets/js/fotorama'));
}

function jsTooltipster() {
return src('assets/admin/js/tooltipster/tooltipster.bundle.js')
.pipe(uglify())
.pipe(rename({ suffix: '.min' }))
.pipe(dest('assets/admin/js/tooltipster'));
}

function jsAdmin() {
return src(['assets/admin/js/cooked-functions.js', 'assets/admin/js/cooked-migration.js'])
.pipe(uglify())
Expand All @@ -55,12 +62,13 @@ function watchFiles() {
watch(['assets/admin/css/tooltipster/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-cooked.css'], cssTooltipster);
watch('assets/js/cooked-functions.js', js);
watch('assets/js/fotorama/fotorama.js', jsFotorama);
watch('assets/admin/js/tooltipster/tooltipster.bundle.js', jsTooltipster);
watch(['assets/admin/js/cooked-functions.js', 'assets/admin/js/cooked-migration.js'], jsAdmin);
}

// Task for building for production.
const build = series(css, cssAdmin, cssTooltipster, js, jsFotorama, jsAdmin);
const build = series(css, cssAdmin, cssTooltipster, js, jsFotorama, jsTooltipster, jsAdmin);
exports.build = build;

// Export the default Gulp task.
exports.default = series(css, cssAdmin, cssTooltipster, js, jsFotorama, jsAdmin, watchFiles);
exports.default = series(css, cssAdmin, cssTooltipster, js, jsFotorama, jsTooltipster, jsAdmin, watchFiles);
2 changes: 1 addition & 1 deletion includes/class.cooked-admin-enqueues.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public function admin_enqueues( $hook ) {
wp_enqueue_style( 'wp-color-picker' );

// Tooltipster
wp_enqueue_script('cooked-tooltipster', COOKED_URL . 'assets/admin/js/tooltipster/tooltipster.bundle.min.js', ['jquery'], COOKED_VERSION, true );
wp_enqueue_script('cooked-tooltipster', COOKED_URL . 'assets/admin/js/tooltipster/tooltipster.bundle' . $min . '.js', ['jquery'], COOKED_VERSION, true );
wp_enqueue_style('cooked-tooltipster-core', COOKED_URL . 'assets/admin/css/tooltipster/tooltipster.bundle.min.css', [], COOKED_VERSION, 'screen' );
wp_enqueue_style('cooked-tooltipster-theme', COOKED_URL . 'assets/admin/css/tooltipster/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-cooked' . $min . '.css', [], COOKED_VERSION, 'screen' );

Expand Down