Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
afragen committed Mar 20, 2023
2 parents 6ec391e + dc2a7c7 commit 6e0d19e
Show file tree
Hide file tree
Showing 61 changed files with 1,888 additions and 1,477 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
.gitignore export-ignore
composer.lock export-ignore
phpunit.xml export-ignore
phpcs.xml export-ignore
phpcs.xml.dist export-ignore
.phpcs.xml export-ignore
/.github export-ignore
/bin export-ignore
/tests export-ignore
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.DS_Store
.idea
.vscode

vendor/bin
vendor/dealerdirect
vendor/squizlabs
vendor/wp-coding-standards
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#### [unreleased]

#### 12.1.3 / 2023-03-20
* improved setting/default of `$options['bypass_background_processing']`
* improved setting/default of `$options['branch_switch']`
* display upgrade notice on `update-core.php`
* composer update `afragen/singleton` for PHP 8.2 compat

#### 12.1.2 / 2023-02-08
* fix for webhook updating issue if `$branches` not defined, thanks @awunsch

Expand Down
15 changes: 11 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,20 @@
"afragen/wp-dependency-installer": "^4",
"freemius/wordpress-sdk": "^2.5"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"squizlabs/php_codesniffer": "3.6.0",
"wp-coding-standards/wpcs": "~2.3.0"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"autoload": {
"psr-4": {
"Fragen\\Git_Updater\\": "src/Git_Updater/"
},
"files": [
"src/Git_Updater/Shim.php"
]
}
},
"scripts": {
"post-update-cmd": [
Expand Down
209 changes: 196 additions & 13 deletions composer.lock

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

2 changes: 1 addition & 1 deletion git-updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Plugin Name: Git Updater
* Plugin URI: https://git-updater.com
* Description: A plugin to automatically update GitHub hosted plugins, themes, and language packs. Additional API plugins available for Bitbucket, GitLab, Gitea, and Gist.
* Version: 12.1.2
* Version: 12.1.3
* Author: Andy Fragen
* License: MIT
* Domain Path: /languages
Expand Down
25 changes: 15 additions & 10 deletions js/ghu-install.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@
* @package git-updater
*/

jQuery(document).ready(
jQuery( document ).ready(
function ($) {
// Hide non-default (Bitbucket & GitLab) settings on page load.
$.each(['bitbucket', 'gitlab', 'gitea', 'zipfile'],
$.each(
['bitbucket', 'gitlab', 'gitea', 'zipfile'],
function () {
$('input.'.concat(this, '_setting')).parents('tr').hide();
});
$( 'input.'.concat( this, '_setting' ) ).parents( 'tr' ).hide();
}
);

// When the api selector changes.
$('select[ name="github_updater_api" ]').on('change',
$( 'select[ name="github_updater_api" ]' ).on(
'change',
function () {

// create difference array.
var hideMe = $(['github', 'bitbucket', 'gitlab', 'gitea', 'zipfile']).not([this.value]).get();
var hideMe = $( ['github', 'bitbucket', 'gitlab', 'gitea', 'zipfile'] ).not( [this.value] ).get();

/*
* Show/hide all settings that have the selected api's class.
Expand All @@ -30,11 +33,13 @@ jQuery(document).ready(
$.each(
hideMe,
function () {
$('input.'.concat(this, '_setting')).parents('tr').hide();
$( 'input.'.concat( this, '_setting' ) ).parents( 'tr' ).hide();
}
);

$('input.'.concat(this.value, '_setting')).parents('tr').show();
$( 'input.'.concat( this.value, '_setting' ) ).parents( 'tr' ).show();

});
});
}
);
}
);
Loading

0 comments on commit 6e0d19e

Please sign in to comment.