Skip to content

Commit

Permalink
Merge branch 'master' into feature/v2
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	.travis.yml
#	README.md
#	bower.json
#	dist/availity-angular-ui-templates.js
#	dist/availity-angular-ui-templates.min.js
#	dist/availity-angular-ui.js
#	dist/availity-angular-ui.min.js
#	dist/availity-angular.js
#	dist/availity-angular.min.js
#	dist/css/availity-angular.css
#	dist/css/availity-angular.min.css
#	dist/css/maps/availity-angular.css.map
#	dist/css/maps/availity-angular.min.css.map
#	dist/maps/availity-angular-ui-templates.js.map
#	dist/maps/availity-angular-ui-templates.min.js.map
#	dist/maps/availity-angular-ui.js.map
#	dist/maps/availity-angular-ui.min.js.map
#	dist/maps/availity-angular.js.map
#	dist/maps/availity-angular.min.js.map
#	gulp/config.js
#	karma.conf-ci.js
#	less/availity-angular.less
#	less/availity-scaffolding.less
#	lib/core/analytics/analytics-exceptions.js
#	lib/core/analytics/analytics-piwik.js
#	lib/core/analytics/analytics-util.js
#	lib/core/analytics/analytics.js
#	lib/core/analytics/docs/analytics-core-demo.html
#	lib/core/analytics/tests/analytics-exceptions-spec.js
#	lib/core/api/api-factory.js
#	lib/core/api/tests/api-factory-spec.js
#	lib/core/logger/logger.js
#	lib/core/validation/validator.js
#	lib/core/validation/validators/tests/validator-email-spec.js
#	lib/core/validation/validators/validator-email.js
#	lib/ui/analytics/analytics.js
#	lib/ui/analytics/tests/analytics-spec.js
#	lib/ui/block/block-directive.js
#	lib/ui/block/block-tpl.html
#	lib/ui/breadcrumbs/breadcrumbs.js
#	lib/ui/breadcrumbs/docs/breadcrumbs-ui-demo.html
#	lib/ui/breadcrumbs/tests/breadcrumbs-spec.js
#	lib/ui/datepicker/datepicker.js
#	lib/ui/datepicker/docs/datepicker-ui-demo.html
#	lib/ui/dropdown/docs/dropdown-ui-demo.html
#	lib/ui/dropdown/dropdown.js
#	lib/ui/dropdown/tests/dropdown-spec.js
#	lib/ui/filters/tests/approximate-spec.js
#	lib/ui/modal/docs/modal-ui-demo.html
#	lib/ui/modal/docs/modal-ui-demo.js
#	lib/ui/modal/modal.js
#	lib/ui/modal/tests/modal-spec.js
#	lib/ui/popover/docs/popover-ui-demo.html
#	lib/ui/popover/popover.js
#	lib/ui/validation/adapter-bootstrap.js
#	lib/ui/validation/adapter.js
#	lib/ui/validation/field.js
#	lib/ui/validation/form.js
#	lib/ui/validation/tests/field-spec.js
#	lib/ui/validation/tests/form-spec.js
#	package.json
#	routes.json
#	src/core/analytics/tests/provider-spec.js
#	src/ui/modal/docs/templates/modal-template.html
  • Loading branch information
Rob McGuinness committed Mar 1, 2017
2 parents 386c2ba + e6aac61 commit 2a600c0
Show file tree
Hide file tree
Showing 23 changed files with 1,257 additions and 1 deletion.
50 changes: 50 additions & 0 deletions data/space.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"id": "1093906101146120962309999999",
"name": "Acme Maryland",
"link": {
"text": "Acme",
"url": "/public/apps/spaces/#/1093906101146120962309999999"
},
"type": "space",
"brand": {
"name": "Acme",
"colors": {
"primary": "#008dc8"
}
},
"owners": [
{
"id": "ABCDEFG",
"name": "Acme",
"link": {}
}
],
"feature": {
"title": "Welcome Acme providers.",
"subtitle": "Looking for your Acme resources?",
"message": "They've moved to the resources tab below."
},
"regions": [
"MD"
],
"permissions": [
"7178"
],
"resources": [
"10595"
],
"images": {
"billboard": "/static/spaces/1093906101146120962309999999/billboard.jpg",
"logo": "/static/spaces/1093906101146120962309999999/banner.png",
"tile": "/static/spaces/1093906101146120962309999999/tile.png"
},
"activeDate": "2016-07-01T04:00:00.000+0000",
"parentIds": [
"payer_spaces"
],
"childIds": [
"7316254620144726724645099999999",
"1046759434145392258588799999999",
"7316254620145589579777099999999"
]
}
21 changes: 21 additions & 0 deletions lib/core/api/api-spaces.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
(function(root) {

'use strict';

var availity = root.availity;

var SpacesFactory = function(AvApiResource) {

// sdk/platform/v1/spaces/10939061011461209623076300008435
return new AvApiResource({
path: '/api/sdk',
level: '/platform',
version: '/v1',
url: '/spaces'
});

};

availity.core.factory('avSpacesResource', SpacesFactory);

})(window);
84 changes: 84 additions & 0 deletions lib/core/logger/tests/logger-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*global it, inject, module, spyOn, beforeEach, expect, describe */
describe('avLogger', function () {
'use strict';

var AvLogger;
var logger;
var formattedTimestamp = '';
var logMock = {
foo: 'bar',
log: function () {},
error: function () {}
};

beforeEach(module('availity', function (_AvLoggerProvider_) {
_AvLoggerProvider_.enabled(true);
}));
beforeEach(inject(function (_AvLogger_) {
AvLogger = _AvLogger_;
logger = new AvLogger('', logMock);

spyOn(AvLogger, 'getFormattedTimestamp').and.callFake(function () {
return formattedTimestamp;
});
}));

describe('logging', function () {
it('calls the delegate\'s log method', function () {
spyOn(logMock, 'log');
formattedTimestamp = '111';

logger.log('foo');

expect(logMock.log).toHaveBeenCalledWith('111 - foo');
});

it('calls the delegate\'s error method', function () {
spyOn(logMock, 'error');
formattedTimestamp = '111';

logger.error('foo');

expect(logMock.error).toHaveBeenCalledWith('111 - foo');
});

it('logs angular errors with a stack', function () {
spyOn(logMock, 'error');
formattedTimestamp = '111';
var err = new Error('Foo');
err.stack = 'bar';

logger.error(err, undefined); // Angular passes along a 'cause' param that is usually undefined

expect(logMock.error).toHaveBeenCalledWith('111 - Error: Foo\nbar');
});

it('handles logging angular errors with {} in them.', function () {
spyOn(logMock, 'error');
formattedTimestamp = '111';
var err = new Error('Foo {}');
err.stack = 'bar';

logger.error(err, undefined); // Angular passes along a 'cause' param that is usually undefined

expect(logMock.error).toHaveBeenCalledWith('111 - Error: Foo {}\nbar');
});

// TODO: More tests around scenarios where 'cause' is not undefined, as I think that might potentially break the logic in _log
});

describe('supplant', function () {
it('should replace interpolated values with the appropriate array element', function () {
var actual = AvLogger.supplant('my {0} message {1}', ['interpolated', 'works']);

expect(actual).toBe('my interpolated message works');
});

it('should return the raw string when no supplant data is passed in', function () {
var actual = AvLogger.supplant('no supplant data', undefined);

expect(actual).toBe('no supplant data');
});
});

});
14 changes: 14 additions & 0 deletions lib/ui/accordion/accordion-group-tpl.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="panel" ng-class="panelClass || 'panel-default'" style="margin-bottom:0px">
<div role="tab" id="{{headingId}}" aria-selected="{{isOpen}}" class="panel-heading pointer" style="cursor:pointer;" ng-keypress="toggleOpen($event)" ng-click="toggleOpen()">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href aria-expanded="{{isOpen}}" aria-controls="{{panelId}}" tabindex="0" class="accordion-toggle">
<span ng-class="{'text-muted': isDisabled}" class="text-primary">{{heading}} </span>
</a>
<span ng-if="popOverContent !== undefined && popOverContent !== ''" class="icon icon-info-circle" data-av-popover="" data-toggle="popover" data-trigger="hover" title="{{popOverContentHeader}}" data-content="{{popOverContent}}"></span>
<span class="pull-right icon icon-down-dir"></span>
</h4>
</div>
<div id="{{panelId}}" aria-labelledby="{{headingId}}" aria-hidden="{{!isOpen}}" role="tabpanel" class="panel-collapse collapse" av-collapse="!isOpen">
<div class="panel-body" ng-transclude></div>
</div>
</div>
1 change: 1 addition & 0 deletions lib/ui/accordion/accordion-tpl.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div role="tablist" ng-transclude></div>
Loading

0 comments on commit 2a600c0

Please sign in to comment.