Skip to content
This repository has been archived by the owner on Mar 29, 2021. It is now read-only.

Commit

Permalink
4.3.0 (#147)
Browse files Browse the repository at this point in the history
* Update deps

* Begin initial reference window refactor + meta lookup

* Too many changes to list (tests are going to fail for now)

* Commit prior to updating reflist buttons

* Update icons on reflist to MD

* Fix broken tests

* Add rollbar + fix a few small issues

* Delete failed portion of test. Will fix later

* Document function

* Remove unused import

* Move scroll handlers to single preventScrollPropagation function in helperFunctions

* Various changes...

- Update ISSUE_TEMPLATE.md
- Improve transition animations
- Add `catch` statements throughout reference list and log using Rollbar
- Update tests
- Update Citeproc-js (bugfixes)

* Various changes...

- Fix tooltip text wrapping
- Fix button class names in PubmedWindow
- Add a few missing translation strings

* Add tests

* Move DOM injections to separate file

* Final build and version bump

* Fix broken gulp task

* Update readme.txt
  • Loading branch information
dsifford authored Sep 13, 2016
1 parent 42873aa commit 8034e2a
Show file tree
Hide file tree
Showing 71 changed files with 2,914 additions and 1,797 deletions.
18 changes: 17 additions & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Please use this template for all bug reports. -->
<!-- Before submitting an issue, please try disabling all other plugins to ensure the issue is isolated within ABT -->

**ABT Version:** 4.2.0
**ABT Version:** 4.3.0

<!-- Which version of PHP are you using with your WordPress installation? -->
**PHP Version:** 5.6
Expand All @@ -12,6 +12,22 @@
<!-- List all activated plugins -->
**Plugin List:**

<!-- What web browser are you using (including version)
How to find your browser version:
Google Chrome: Enter "chrome://version" in the URL bar.
Firefox: Open the menu -> click "help" -> click "About Firefox"
Edge: Select More in the upper-right corner, and then select Settings. Then look for your version under "About this app".
Safari: Click "Safari" -> "About Safari"
-- If you are using either of these browers, STRONGLY consider changing to one above.
Internet Explorer: https://support.microsoft.com/en-us/help/17295/windows-internet-explorer-which-version
Opera: Click the "Opera" button -> Click "About Opera"
-->

**Browser:** Google Chrome (Version: xxx)

<!-- What did you expect to happen? -->
**Expected behavior:**

Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ services:
DB_PASS: root
WP_DEBUG: 'true'
PLUGINS: >-
'query-monitor'
co-authors-plus,
log-deprecated-notices,
piglatin,
query-monitor
db:
image: mysql:5.7
ports:
Expand Down
7 changes: 7 additions & 0 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ gulp.task('bump', () => {
return merge(srcFiles, repoFiles);
});

gulp.task('rollbar', () =>
gulp.src('dist/lib/php/dom-injects.php', { base: './' })
.pipe(replace(/(payload: {\n.+?environment: "test"\n.+?})/, ''))
.pipe(gulp.dest('./'))
);

// Translations
gulp.task('pot', () =>
gulp
Expand Down Expand Up @@ -213,6 +219,7 @@ gulp.task('_build',
'clean', 'bump',
gulp.parallel('stylus:prod', 'static', 'webpack:prod'),
gulp.parallel('js', 'php'),
'rollbar',
'pot'
)
);
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "academic-bloggers-toolkit",
"version": "4.2.0",
"version": "4.3.0",
"description": "A plugin extending the functionality of WordPress for Academic Blogging.",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,7 +29,7 @@
"homepage": "https://github.com/dsifford/academic-bloggers-toolkit#readme",
"devDependencies": {
"autoprefixer": "^6.4.1",
"awesome-typescript-loader": "^2.2.1",
"awesome-typescript-loader": "^2.2.4",
"babel-core": "^6.14.0",
"babel-loader": "^6.2.5",
"babel-polyfill": "^6.13.0",
Expand All @@ -41,9 +41,9 @@
"css-loader": "^0.25.0",
"del": "^2.2.2",
"enzyme": "^2.4.1",
"eslint": "^3.4.0",
"eslint-config-airbnb-base": "^5.0.3",
"eslint-plugin-import": "^1.14.0",
"eslint": "^3.5.0",
"eslint-config-airbnb-base": "^7.1.0",
"eslint-plugin-import": "^1.15.0",
"gulp": "github:gulpjs/gulp#4.0",
"gulp-replace": "^0.5.4",
"gulp-sort": "^2.0.0",
Expand All @@ -54,7 +54,7 @@
"jest": "^15.1.1",
"jest-cli": "^15.1.1",
"merge-stream": "^1.0.0",
"mobx-react-devtools": "^4.2.5",
"mobx-react-devtools": "^4.2.6",
"poststylus": "^0.2.3",
"react-addons-test-utils": "^15.3.1",
"sinon": "^1.17.5",
Expand All @@ -67,18 +67,18 @@
},
"dependencies": {
"@types/enzyme": "^2.4.32",
"@types/jest": "^0.9.30",
"@types/react": "^0.14.33",
"@types/jest": "^0.9.31",
"@types/react": "^0.14.34",
"@types/react-addons-css-transition-group": "^0.14.16",
"@types/react-dom": "^0.14.16",
"@types/sinon": "^1.16.29",
"mobx": "^2.5.1",
"mobx-react": "^3.5.5",
"mobx-react": "^3.5.6",
"react": "^15.3.1",
"react-addons-css-transition-group": "^15.3.1",
"react-addons-shallow-compare": "^15.3.1",
"react-dom": "^15.3.1",
"react-virtualized-select": "^1.3.0",
"react-virtualized-select": "^1.4.0",
"typescript": "^2.1.0-dev.20160724"
},
"babel": {
Expand Down
39 changes: 7 additions & 32 deletions scripts/fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ exports.ABT_i18n = {
"import": "Import references from RIS file",
"refresh": "Refresh reference list",
"destroy": "Delete all references",
"help": "View usage instructions",
"help": "Usage instructions",
},
"stylePlaceholder": "Choose citation style..."
}
Expand All @@ -275,19 +275,21 @@ exports.ABT_i18n = {
"search": "Search",
"next": "Next",
"previous": "Previous",
"addReference": "Add Reference"
"addReference": "Select",
"viewReference": "View",
},
"referenceWindow": {
"referenceWindow": {
"title": "Insert Formatted Reference"
"title": "Add Reference"
},
"people": {
"add": "Add another",
"add": "Add Contributor",
"contributors": "Contributors",
"surname": "Surname",
"given": "Given Name, M.I."
},
"manualEntryContainer": {
"type": "Select Citation Type"
"type": "Citation Type"
},
"identifierInput": {
"label": "PMID/DOI"
Expand All @@ -302,33 +304,6 @@ exports.ABT_i18n = {
}
}
},
"peerReviewMetabox": {
"peerReviewMetabox": {
"optionText": [
"Select Number of Reviewers",
"One Reviewer",
"Two Reviewers",
"Three Reviewers"
],
"review1": "Review 1",
"review2": "Review 2",
"review3": "Review 3",
"mediaButton": "Use this image",
"mediaTitle": "Choose or Upload an Image"
},
"reviewRow": {
"reviewHeading": "Review Heading",
"toggleResponse": "Toggle Author Response"
},
"commonRowContent": {
"name": "Name",
"twitter": "Twitter Handle",
"background": "Background",
"content": "Content",
"photo": "Photo",
"imageButton": "Choose or Upload an Image"
}
},
"fieldmaps": {
"bill": {
"title": "Bill",
Expand Down
41 changes: 6 additions & 35 deletions src/academic-bloggers-toolkit.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
* Plugin Name: Academic Blogger's Toolkit
* Plugin URI: https://wordpress.org/plugins/academic-bloggers-toolkit/
* Description: A plugin extending the functionality of Wordpress for academic blogging
* Version: 4.2.0
* Version: 4.3.0
* Author: Derek P Sifford
* Author URI: https://github.com/dsifford
* License: GPL3 or later
* Text Domain: academic-bloggers-toolkit
*/

define('ABT_VERSION', '4.2.0');
define('ABT_VERSION', '4.3.0');


/**
Expand Down Expand Up @@ -43,7 +43,7 @@ function abt_uninstall() {
* Current schema configuration can be found here:
* http://www.jsoneditoronline.org/?id=8f65b4f64daaf41e5ed94c4a006ba264
*/
function abt_refactor_depreciated_options() {
function abt_refactor_deprecated_options() {
$options = get_option('abt_options');
if ($options['VERSION'] === ABT_VERSION) return;

Expand Down Expand Up @@ -71,7 +71,7 @@ function abt_refactor_depreciated_options() {

update_option('abt_options', $newOptions);
}
add_action('admin_init', 'abt_refactor_depreciated_options');
add_action('admin_init', 'abt_refactor_deprecated_options');


/**
Expand All @@ -88,36 +88,6 @@ function abt_add_options_link ($links) {
}
add_filter('plugin_action_links_' . plugin_basename(__FILE__), 'abt_add_options_link');


/**
* Appends the changelog script to the document footer on the editor pages
*/
function abt_append_changelog_script() {
global $pagenow, $post_type;

$not_editor_page = !in_array($pagenow, ['post.php', 'post-new.php']);
$invalid_post_type = in_array($post_type, ['attachment', 'acf']);

if ($not_editor_page || $invalid_post_type) return;

echo '<script type="text/javascript">var el=document.createElement("SPAN");el.id="abt_changelog",document.querySelector("#abt_reflist > h2").appendChild(el);var HW_config={selector:"#abt_changelog",account:"LJ4gE7"};</script><script async src="//cdn.headwayapp.co/widget.js"></script>';
}
add_action('admin_footer', 'abt_append_changelog_script');


/**
* Adds CSS overrides
*/
function abt_css_override(){
$abt_options = get_option('abt_options');
if (isset($abt_options['custom_css']) && !empty($abt_options['custom_css'])) {
$custom_css = $abt_options['custom_css'];
echo "<style id='custom_css'>$custom_css\r\n</style>";
}
}
add_action('wp_head', 'abt_css_override');


/**
* Enqueues frontend JS and CSS
*/
Expand All @@ -132,8 +102,9 @@ function abt_frontend_scripts() {
}
add_action('wp_enqueue_scripts', 'abt_frontend_scripts');


require_once('lib/php/dom-injects.php');
require_once('lib/php/backend.php');
require_once('lib/php/options-page.php');
require_once('lib/php/endpoints.php');

?>
Loading

0 comments on commit 8034e2a

Please sign in to comment.