Skip to content

Commit

Permalink
fixed js bug
Browse files Browse the repository at this point in the history
  • Loading branch information
kyle-jennings committed Jul 10, 2018
1 parent ac9ade9 commit 5e2d179
Show file tree
Hide file tree
Showing 47 changed files with 5 additions and 3,063 deletions.
2 changes: 1 addition & 1 deletion franklin.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Plugin URI: https://github.com/kyle-jennings/franklin
Description: Companion plugin for the Benjamin theme. This plugin contains shortcodes, and support for Digital Search
Author: Kyle Jennings
Version: 1.3
Version: 1.4
Author URI: https://kylejenningsdesign.com
Sites report is released under GPL:
Expand Down
13 changes: 1 addition & 12 deletions inc/assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,9 @@
function franklin_enqueue_script() {
wp_enqueue_script(
'franklin',
plugin_dir_url( dirname(__FILE__) ) . 'assets/js/franklin.js',
plugin_dir_url( dirname(__FILE__) ) . 'assets/js/franklin.min.js',
array( 'jquery' )
);
}

add_action( 'customize_controls_enqueue_scripts', 'franklin_enqueue_script' );


function franklin_admin_enqueue_script() {
wp_enqueue_script(
'franklin-admin',
plugin_dir_url( dirname(__FILE__) ) . 'assets/js/franklin-post-formats.js',
array( 'jquery' )
);
}

add_action( 'admin_enqueue_scripts', 'franklin_admin_enqueue_script' );
4 changes: 2 additions & 2 deletions inc/class-post-formats.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ public static function enqueue()
global $typenow;

if (in_array($typenow, self::$screens, true)) {
$file = get_template_directory_uri() . '/assets/admin/js/';
$file .= '_benjamin-post-formats-min.js';
$file = plugin_dir_url(dirname(__FILE__)) . '/assets/js/';
$file .= 'franklin-post-formats.min.js';

wp_enqueue_script('post_formats_js', $file, array('jquery'), null, true);
}
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Franklin
Requires at least: 4.5
Requires Benjamin theme
Tested up to: 4.7
Stable tag: 1.3
Stable tag: 1.4
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down
339 changes: 0 additions & 339 deletions svn/tags/1.3/LICENSE

This file was deleted.

83 changes: 0 additions & 83 deletions svn/tags/1.3/README.md

This file was deleted.

35 changes: 0 additions & 35 deletions svn/tags/1.3/assets/css/franklin.css

This file was deleted.

146 changes: 0 additions & 146 deletions svn/tags/1.3/assets/js/franklin.js

This file was deleted.

59 changes: 0 additions & 59 deletions svn/tags/1.3/franklin.php

This file was deleted.

13 changes: 0 additions & 13 deletions svn/tags/1.3/inc/ajax.php

This file was deleted.

Loading

0 comments on commit 5e2d179

Please sign in to comment.