bastion 4.2.0 → 4.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1b6d287c667939df014a45086236bd915114ebf8
4
- data.tar.gz: 40d47f913d1b43f0f4c2a2240b467c6737d51ac6
3
+ metadata.gz: 85d875742035112dafbd305f52854be0bba89028
4
+ data.tar.gz: b21d0249a676d1d8fdc981e000aff241d6261680
5
5
  SHA512:
6
- metadata.gz: 7d423ce033cd373f3acb0d4416f3305cad5f04ce36591c3dc16c038dd6253112df538ced1dd1eedaa9839469f4328221dbdf86eb9b9072bbaf278a88ad31d3f0
7
- data.tar.gz: 2d2f4506c5f5b55f83c17afb67461f0beebed6b6b93a030c1b140cc8d951b3acd1de8045ec3644f4e277669edaa8e4e80278ff57efaee95b90f17ede61461d47
6
+ metadata.gz: ba1abd30979444ced61f3fd794b18b78c7996908493041e4a9d1749e3aa840b525c41b44224f6d218cb206207fd1f7dba08708a01c9fa204efa33c106ad6e8e4
7
+ data.tar.gz: 3d59660d01b6341e6fcaf06768b7dd5ec74b15aef90e7eb401f4b59825e21158445974285892ae65bb433a7ffed31ed37dab3e2a931a0c1cd8acba335002ddcb
@@ -1,6 +1,7 @@
1
1
  //= require "bastion/angular/angular"
2
2
  //= require "bastion/angular-resource/angular-resource"
3
3
  //= require "bastion/angular-sanitize/angular-sanitize"
4
+ //= require "bastion/angular-patternfly/angular-patternfly.js"
4
5
  //= require "bastion/angular-ui-router/angular-ui-router"
5
6
  //= require "bastion/angular-uuid4/angular-uuid4.js"
6
7
  //= require "bastion/ngUpload/ng-upload"
@@ -53,7 +53,7 @@ angular.module('Bastion.components').factory('Nutupane',
53
53
  params: params,
54
54
  resource: resource,
55
55
  rows: [],
56
- searchTerm: $location.search()[self.searchKey],
56
+ searchTerm: $location.search()[self.searchKey] || "",
57
57
  initialLoad: true
58
58
  };
59
59
 
@@ -14,14 +14,6 @@
14
14
  </div>
15
15
  </div>
16
16
 
17
- <div class="row">
18
- <header class="col-sm-12">
19
- <h3>
20
- <span data-block="sub-header"></span>
21
- </h3>
22
- </header>
23
- </div>
24
-
25
17
  <div class="row">
26
18
  <div class="col-sm-12 page-content">
27
19
  <div ng-hide="page && (page.loading || page.error)">
@@ -15,7 +15,8 @@
15
15
  ng-model="table.searchTerm"
16
16
  ng-trim="false"
17
17
  uib-typeahead="item.label for item in table.autocomplete($viewValue)"
18
- typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
18
+ typeahead-template-url="components/views/autocomplete-scoped-search.html"
19
+ typeahead-min-length="0"/>
19
20
 
20
21
  <span class="input-group-btn">
21
22
  <button class="btn btn-default"
@@ -70,9 +70,11 @@ angular.module('Bastion.routing', ['ui.router']);
70
70
 
71
71
  if (rootPath) {
72
72
  foundParentState = _.find($state.get(), function (state) {
73
- var found = false;
74
- if (state.url) {
75
- found = getRootPath(state.url) === rootPath;
73
+ var found = false,
74
+ stateUrl = $state.href(state);
75
+
76
+ if (stateUrl) {
77
+ found = getRootPath(stateUrl) === rootPath;
76
78
  }
77
79
 
78
80
  return found;
@@ -50,8 +50,8 @@ ul {
50
50
  // Need to override these because .bastion .dropdown-menu (we wrap
51
51
  // everything in .bastion) has more specificity than these selectors
52
52
  // and thus overrides them making them not displayed when they should be.
53
- [uib-typeahead-popup].dropdown-menu,
54
- .uib-datepicker-popup.dropdown-menu
53
+ html [uib-typeahead-popup].dropdown-menu,
54
+ html .uib-datepicker-popup.dropdown-menu
55
55
  {
56
56
  display: block;
57
57
  }
@@ -9,6 +9,10 @@
9
9
  text-align: center;
10
10
  }
11
11
 
12
+ td, th {
13
+ word-wrap: break-word;
14
+ }
15
+
12
16
  tr.clickable-row,
13
17
  th.sortable {
14
18
  cursor: pointer;
data/bower.json CHANGED
@@ -3,31 +3,33 @@
3
3
  "version": "0.0.1",
4
4
  "main": [],
5
5
  "dependencies": {
6
- "json3": "~3.2.4",
7
- "es5-shim": "~2.0.8",
8
6
  "angular": "=1.5.5",
9
- "angular-bootstrap": "2.3.1",
10
- "angular-breadcrumb": "=0.4.1",
11
- "angular-sanitize": "=1.5.5",
7
+ "angular-animate": "=1.5.5",
8
+ "angular-i18n": "1.5.5",
12
9
  "angular-resource": "=1.5.5",
13
10
  "angular-route": "=1.5.5",
11
+ "angular-sanitize": "=1.5.5",
12
+ "angular-blocks": "~>0.1.8",
13
+ "angular-bootstrap": "2.3.1",
14
+ "angular-breadcrumb": "=0.4.1",
14
15
  "angular-gettext": "=1.0.0",
16
+ "angular-patternfly": "4.0.0-alpha.2",
15
17
  "angular-ui-router": "=0.3.1",
16
- "angular-blocks": "~>0.1.8",
17
- "angular-i18n": "1.5.5",
18
+ "angular-uuid4": "0.1.0",
19
+ "es5-shim": "~2.0.8",
20
+ "json3": "~3.2.4",
18
21
  "ngInfiniteScroll": "1.2.1",
19
- "ngUpload": "0.5.18",
20
- "angular-animate": "=1.5.5",
21
- "angular-uuid4": "0.1.0"
22
+ "ngUpload": "0.5.18"
22
23
  },
23
24
  "devDependencies": {
24
- "jquery": "=1.9.1",
25
25
  "angular-mocks": "=1.5.5",
26
26
  "angular-scenario": "=1.5.5",
27
+ "jquery": "=1.9.1",
27
28
  "lodash": "~4.15.0"
28
29
  },
29
30
  "resolutions": {
30
31
  "angular": "1.5.5",
32
+ "angular-bootstrap": "2.3.1",
31
33
  "jquery": "=1.9.1"
32
34
  },
33
35
  "exportsOverride": {
@@ -40,6 +42,9 @@
40
42
  "angular": {
41
43
  "javascripts/bastion/angular": "angular.js"
42
44
  },
45
+ "angular-patternfly": {
46
+ "javascripts/bastion/angular-patternfly": "dist/angular-patternfly.js"
47
+ },
43
48
  "angular-sanitize": {
44
49
  "javascripts/bastion/angular-sanitize": "angular-sanitize.js"
45
50
  },
@@ -1,3 +1,3 @@
1
1
  module Bastion
2
- VERSION = "4.2.0"
2
+ VERSION = "4.2.1"
3
3
  end
@@ -57,6 +57,7 @@ describe('config: Bastion.routing', function () {
57
57
  describe("handles undefined states by", function () {
58
58
  it("redirecting to a 404 page if the parent state is found", function () {
59
59
  spyOn($state, 'get').and.returnValue([{url: '/found-state'}]);
60
+ spyOn($state, 'href').and.returnValue('/found-state');
60
61
  spyOn($state, 'go');
61
62
 
62
63
  goTo('/found_state/does_not_exist');