Skip to content

Commit 251b5cc

Browse files
committed
global settings
1 parent c842ee3 commit 251b5cc

File tree

9 files changed

+50
-118
lines changed

9 files changed

+50
-118
lines changed

assets/admin/css/style.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
.ajax-inspector .saved-request-list-wrapper table tr:hover > .ajax-list-action {
9595
display: block;
9696
}
97+
.ajax-global-settings-content p {
98+
margin: 0!important;
99+
}
100+
.ajax-global-settings-content .save-global-settings {
101+
margin-top: 10px;
102+
}
97103
.ajax-actions {
98104
display: flex;
99105
justify-content: space-between;

assets/admin/css/style.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@
115115
}
116116
}
117117

118+
119+
.ajax-global-settings-content{
120+
p{
121+
margin: 0!important;
122+
}
123+
.save-global-settings{
124+
margin-top: 10px;
125+
}
126+
}
127+
118128
.ajax-actions {
119129
display: flex;
120130
justify-content: space-between;

assets/admin/src/angular-app/app.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,15 @@ myApp.controller('AppCtrl', function ($scope, $http) {
178178
})
179179
}
180180

181+
$scope.globalSettings = {
182+
preRequestScript: "_ajax.addParam('foo','bar')"
183+
}
184+
185+
$scope.openGlobalSettings = function () {
186+
let url = '#TB_inline?width=600&height=200&inlineId=ajax-global-settings';
187+
tb_show('Global Settings', url, false);
188+
}
189+
181190
/**
182191
* Update plugin
183192
*/
@@ -216,6 +225,7 @@ myApp.controller('AppCtrl', function ($scope, $http) {
216225

217226
$scope.pluginInfo.newVersion = newVersion
218227
$scope.pluginInfo.updateAvailable = compareVersion($scope.pluginInfo.currentVersion, '<', newVersion)
228+
// $scope.pluginInfo.updateAvailable = true;
219229
})
220230
}
221231

assets/admin/src/react-app/components/App.js

Lines changed: 0 additions & 72 deletions
This file was deleted.

assets/admin/src/react-app/index.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

assets/admin/src/react-app/utils.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Hooks/Assets.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,18 @@ public function __construct() {
2929
*/
3030
public function load_admin_assets() {
3131
wp_enqueue_style( 'ajax-admin-css', $this->admin_asset_url . '/css/style.css', array(), $this->plugin_version );
32-
wp_enqueue_script( 'ajax-angularjs', $this->admin_asset_url . '/libs/angular.min.js', array(), $this->plugin_version, true );
3332

33+
wp_enqueue_script( 'ajax-angularjs', $this->admin_asset_url . '/libs/angular.min.js', array(), $this->plugin_version, true );
3434
wp_enqueue_style( 'ajax-json-viewer-css', $this->admin_asset_url . '/libs/json-viewer/jquery.json-viewer.css', array(), $this->plugin_version );
3535
wp_enqueue_script( 'ajax-json-viewer-js', $this->admin_asset_url . '/libs/json-viewer/jquery.json-viewer.js', array(), $this->plugin_version, true );
3636

3737
wp_enqueue_script( 'ajax-admin-js', $this->admin_asset_url . '/js/angular-app.js', array( 'ajax-angularjs' ), $this->plugin_version, true );
3838

39-
wp_enqueue_script(
40-
'ajax-react-app',
41-
$this->admin_asset_url . '/js/react-app.js',
42-
array( 'wp-element' ),
43-
$this->plugin_version,
44-
true
45-
);
46-
4739
wp_enqueue_script( 'thickbox' );
4840
wp_enqueue_style( 'thickbox' );
4941

5042
wp_localize_script(
51-
'ajax-react-app',
43+
'ajax-admin-js',
5244
'_ajax',
5345
array(
5446
'version' => AJAX_VERSION,

src/Views/index-angular.php

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,29 @@
1414
<p>v<?php echo esc_html( AJAX_VERSION ); ?></p>
1515
</div>
1616

17-
<div class="display-flex align-items-center gap-10" ng-show="pluginInfo.updateAvailable">
18-
<span style="color: red;" ng-hide="updating">New version available - <strong>v{{pluginInfo.newVersion}}</strong></span>
17+
<!-- global settings -->
18+
<div id="ajax-global-settings" style="display: none;">
19+
<div class="ajax-global-settings-content">
20+
<p><strong>Pre-request Script</strong></p>
21+
<textarea ng-model="globalSettings.preRequestScript" rows="4" style="width: 100%;"></textarea>
22+
<br>
23+
<button type="button" class="button button-primary save-global-settings">Save</button>
24+
</div>
25+
</div>
26+
<!-- end global settings -->
27+
<div class="display-flex align-items-center gap-10">
28+
<div class="display-flex align-items-center gap-10" ng-show="pluginInfo.updateAvailable">
29+
<span style="color: red;" ng-hide="updating">New version available - <strong>v{{pluginInfo.newVersion}}</strong></span>
1930

20-
<button type="button" ng-hide="updating" class="button button-default" ng-click="updatePlugin()">{{updating? 'Updating':'Update Now'}}</button>
31+
<button type="button" ng-hide="updating" class="button button-primary" ng-click="updatePlugin()">{{updating? 'Updating':'Update Now'}}</button>
2132

22-
<span class="updating-info" ng-show="updating">
23-
<span class="dashicons dashicons-update"></span>
24-
Updating version from <strong>{{pluginInfo.currentVersion}}</strong> to <strong>{{pluginInfo.newVersion}}</strong>
25-
</span>
33+
<span class="updating-info" ng-show="updating">
34+
<span class="dashicons dashicons-update"></span>
35+
Updating version from <strong>{{pluginInfo.currentVersion}}</strong> to <strong>{{pluginInfo.newVersion}}</strong>
36+
</span>
37+
</div>
38+
39+
<button ng-click="openGlobalSettings()" type="button" class="button button-default" style="line-height: 22px;"><span class="dashicons dashicons-admin-settings"></span> Global Settings</button>
2640
</div>
2741
</div>
2842

@@ -67,7 +81,6 @@
6781
</div>
6882

6983
<div class="saved-request-list-wrapper" ng-show="savedList.length">
70-
7184
<div class="wp-filter">
7285
<ul class="filter-links">
7386
<li class="plugin-install-featured">

webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ const defaults = require('@wordpress/scripts/config/webpack.config');
22
const FilterEntryOutputPlugin = require('filter-entry-output-plugin')
33

44
let entry = {
5-
'angular-app': './assets/admin/src/angular-app/app.js',
6-
//'react-app': './assets/admin/src/react-app/index.js',
5+
'angular-app': './assets/admin/src/angular-app/app.js'
76
};
87

98
let output = {

0 commit comments

Comments
 (0)