Skip to content

Commit

Permalink
⬆️ v3.5.1...v3.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Mar 30, 2022
1 parent bac87b6 commit 04be13a
Show file tree
Hide file tree
Showing 9 changed files with 1,438 additions and 164 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 10.16.3
nodejs 10.24.1
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ env:
# See https://git.io/vdao3 for details.
- JOBS=1

branches:
only:
- master
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
allow_failures:
Expand All @@ -40,6 +46,7 @@ jobs:
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# How To Contribute

## Installation

* `git clone <repository-url>`
* `cd ember-cli-bootstrap3-popover`
* `yarn install`

## Linting

* `yarn lint:hbs`
* `yarn lint:js`
* `yarn lint:js --fix`

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
142 changes: 66 additions & 76 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,38 @@

This addon allows you to quickly and conveniently create a [Bootstrap3 Popover](https://getbootstrap.com/docs/3.3/javascript/#popovers).

## Tested Against

[![ember-lts-2.4](https://img.shields.io/badge/ember--try-ember--lts--2.4-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)
[![ember-lts-2.8](https://img.shields.io/badge/ember--try-ember--lts--2.8-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)
[![ember-lts-2.12](https://img.shields.io/badge/ember--try-ember--lts--2.12-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)

[![ember-release](https://img.shields.io/badge/ember--try-ember--release-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)
[![ember-beta](https://img.shields.io/badge/ember--try-ember--beta-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)
[![ember-canary](https://img.shields.io/badge/ember--try-ember--canary-brightgreen.svg)](https://circleci.com/gh/cybertoothca/ember-cli-bootstrap3-popover)

## Demo

The demonstration web application can be found here:
[http://ember-cli-bootstrap3-popover.cybertooth.io/](http://ember-cli-bootstrap3-popover.cybertooth.io/).
[http://ember-cli-bootstrap3-popover.cybertooth.io/](http://ember-cli-bootstrap3-popover.cybertooth.io/).

## What Does This Addon Do?

This addon supplies the following _components_:

* `twbs-popover` - a container-like element for the popover's markup, options, methods, and events.
* `twbs-popover/content` - a component you nest inside a `twbs-popover` that will generate
the _content_ for the popover.
* `twbs-popover/title` - a component you nest inside a `twbs-popover` that will generate
the _title_ for the popover.
* `twbs-popover/trigger` - the component you nest inside a `twbs-popover` that acts as the bound element for the
popover and in normal trigger events will accept clicks, hovering, and focus events to toggle the popover.
- `twbs-popover` - a container-like element for the popover's markup, options, methods, and events.
- `twbs-popover/content` - a component you nest inside a `twbs-popover` that will generate
the _content_ for the popover.
- `twbs-popover/title` - a component you nest inside a `twbs-popover` that will generate
the _title_ for the popover.
- `twbs-popover/trigger` - the component you nest inside a `twbs-popover` that acts as the bound element for the
popover and in normal trigger events will accept clicks, hovering, and focus events to toggle the popover.

The following _mixin_ also ships with this addon:

* `Popover` - imported as `import Popover as 'ember-cli-bootstrap3-popover/mixins/popover'` and includes all of the
popover options as found in the [Bootstrap documentation](https://getbootstrap.com/docs/3.3/javascript/#popovers-options).
- `Popover` - imported as `import Popover as 'ember-cli-bootstrap3-popover/mixins/popover'` and includes all of the
popover options as found in the [Bootstrap documentation](https://getbootstrap.com/docs/3.3/javascript/#popovers-options).

_Further information about these items can be found in the Usage section below._

## Requirements

* **Ember >= 2.3.0**: This addon uses the [hash helper](http://emberjs.com/blog/2016/01/15/ember-2-3-released.html#toc_hash-helper) which was introduced in Ember-2.3.0.
* Ember CLI
* You must have Bootstrap 3.x installed in your Ember application. Feel free to use the
- **Ember >= 2.3.0**: This addon uses the [hash helper](http://emberjs.com/blog/2016/01/15/ember-2-3-released.html#toc_hash-helper) which was introduced in Ember-2.3.0.
- Ember CLI
- You must have Bootstrap 3.x installed in your Ember application. Feel free to use the
[ember-cli-bootstrap3-sass](http://emberobserver.com/addons/ember-cli-bootstrap3-sass)
addon to setup Bootstrap if you haven't already done so.
* Popovers require the _tooltip_ plugin to be included in your version of Bootstrap.
- Popovers require the _tooltip_ plugin to be included in your version of Bootstrap.

## Installation

Expand All @@ -59,7 +49,7 @@ The following will install this addon:
ember install ember-cli-bootstrap3-popover
```

__As mentioned, you must install Bootstrap3 along with the tooltip plugin. See the requirements section above.__
**As mentioned, you must install Bootstrap3 along with the tooltip plugin. See the requirements section above.**

### Upgrading

Expand All @@ -76,31 +66,31 @@ As mentioned above there are dozens of examples on the demonstration site:

#### `{{twbs-popover}}`

A component that contains all of the markup associated with the popover. You can nest `{{twbs-popover.content}}`,
A component that contains all of the markup associated with the popover. You can nest `{{twbs-popover.content}}`,
`{{twbs-popover.title}}`, and `{{twbs-popover.trigger}}` inside this components block.

The reason this addon requires **Ember-2.3.0+** is because this particular component uses the _hash_ helper.

**Be aware that when you nest either the content or title it will be automatically treated as html.**
**Be aware that when you nest either the content or title it will be automatically treated as html.**

##### Arguments

* _All of the properties listed in the `Popover` mixin_.
* `onShow` - the property that accepts an action closure hooked to the bootstrap `show.bs.popover` event.
* `onShown` - the property that accepts an action closure hooked to the bootstrap `shown.bs.popover` event.
* `onHide` - the property that accepts an action closure hooked to the bootstrap `hide.bs.popover` event.
* `onHidden` - the property that accepts an action closure hooked to the bootstrap `hidden.bs.popover` event.
* `onInserted` - the property that accepts an action closure hooked to the bootstrap `inserted.bs.popover` event.
- _All of the properties listed in the `Popover` mixin_.
- `onShow` - the property that accepts an action closure hooked to the bootstrap `show.bs.popover` event.
- `onShown` - the property that accepts an action closure hooked to the bootstrap `shown.bs.popover` event.
- `onHide` - the property that accepts an action closure hooked to the bootstrap `hide.bs.popover` event.
- `onHidden` - the property that accepts an action closure hooked to the bootstrap `hidden.bs.popover` event.
- `onInserted` - the property that accepts an action closure hooked to the bootstrap `inserted.bs.popover` event.

([Check out the demo...](http://ember-cli-bootstrap3-popover.cybertooth.io/))

##### Actions

The following popover methods are exposed as actions:

* `hide` - triggers the hiding of a popover.
* `show` - triggers the showing of a popover.
* `toggle` - toggles a popover.
- `hide` - triggers the hiding of a popover.
- `show` - triggers the showing of a popover.
- `toggle` - toggles a popover.

#### `{{twbs-popover/content}}`

Expand All @@ -109,7 +99,7 @@ This component promotes the easy re-use of existing components inside the popove

##### Arguments

* _None_.
- _None_.

#### `{{twbs-popover/title}}`

Expand All @@ -118,7 +108,7 @@ This component promotes the easy re-use of existing components inside the popove

##### Arguments

* _None_.
- _None_.

#### `{{twbs-popover/trigger}}`

Expand All @@ -130,7 +120,7 @@ Seriously, check out the examples and all of this will make sense:

##### Arguments

* _None_.
- _None_.

### Mixins

Expand All @@ -141,23 +131,23 @@ here: [http://getbootstrap.com/javascript/#popovers-options](https://getbootstra

##### Properties

* `animation?` (aliased to `animation`)- **Default** `true`
* `content` - **Default** `''`
* `delay` - **Default** `0`
* `delayHide` - **Default** `undefined`
* `delayShow` - **Default** `undefined`
* `html?` (aliased to `html`) - **Default** `false`
* `placement` - **Default** `'right'`
* `popoverContainer` - **Default** `false`
* `popoverTemplate` - **Default** `'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'`
* `popoverTrigger` - **Default** `'click'`
* `selector` - **Default** `false`
* `title` - **Default** `''`
- `animation?` (aliased to `animation`)- **Default** `true`
- `content` - **Default** `''`
- `delay` - **Default** `0`
- `delayHide` - **Default** `undefined`
- `delayShow` - **Default** `undefined`
- `html?` (aliased to `html`) - **Default** `false`
- `placement` - **Default** `'right'`
- `popoverContainer` - **Default** `false`
- `popoverTemplate` - **Default** `'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'`
- `popoverTrigger` - **Default** `'click'`
- `selector` - **Default** `false`
- `title` - **Default** `''`

##### Methods

* `getOptions()` - returns a hash containing the options from this mixin
that are used to initialize the Bootstrap popover.
- `getOptions()` - returns a hash containing the options from this mixin
that are used to initialize the Bootstrap popover.

### Troubleshooting And Tips

Expand Down Expand Up @@ -190,56 +180,56 @@ yarn

## Running The Dummy Application

* `ember server`
* Visit your app at http://localhost:4200.
- `ember server`
- Visit your app at http://localhost:4200.

### Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm run lint:js -- --fix`
- `npm run lint:hbs`
- `npm run lint:js`
- `npm run lint:js -- --fix`

### Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions
- `ember test` – Runs the test suite on the current Ember version
- `ember test --server` – Runs the test suite in "watch mode"
- `ember try:each` – Runs the test suite against multiple Ember versions

## Building The Addon

* `ember build`
- `ember build`

For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).

# Linking This Addon For Local Testing

## Linking

1. From the command line at the root of __this__ project run the
`npm link` command to _link_ this addon within your local
node repository.
1. From the command line at the root of **this** project run the
`npm link` command to _link_ this addon within your local
node repository.
1. From the _other_ Ember project that you wish to test this addon
in, execute the following command:
`npm link ember-cli-bootstrap3-popover`.
in, execute the following command:
`npm link ember-cli-bootstrap3-popover`.
1. Now in that same _other_ Ember project, you should go into the
`package.json` and add the ember addon with the version _*_. It will
look something like this: `"ember-cli-bootstrap3-popover": "*"`. Now
when/if you execute `npm install` on this _other_ project it
will know to look for the linked addon rather than fetch it from
the central repository.
`package.json` and add the ember addon with the version _\*_. It will
look something like this: `"ember-cli-bootstrap3-popover": "*"`. Now
when/if you execute `npm install` on this _other_ project it
will know to look for the linked addon rather than fetch it from
the central repository.

## Unlinking

1. Remove the addon from your local node repository with the following
command (that can be run anywhere):
`npm uninstall -g ember-cli-bootstrap3-popover`
command (that can be run anywhere):
`npm uninstall -g ember-cli-bootstrap3-popover`
1. Remove the reference to the `ember-cli-bootstrap3-popover`
in your _other_ project's `package.json`.
in your _other_ project's `package.json`.
1. Run an `npm prune` and `bower prune` from the root of your _other_ project's command line.

# Deploying The Dummy Application

Make sure your `~/.aws/credentials` file has a profile named _cybertooth_
Make sure your `~/.aws/credentials` file has a profile named _cybertooth_
with a valid key and secret,

```
Expand Down
12 changes: 12 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ module.exports = function() {
}
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
}
},
{
name: 'ember-release',
npm: {
Expand All @@ -58,6 +66,10 @@ module.exports = function() {
}
}
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each"
"test:all": "ember try:each",
"update-browserslist": "npx browserslist@latest --update-db"
},
"dependencies": {
"ember-cli-babel": "^7.13.2",
Expand All @@ -52,16 +53,14 @@
"bootstrap-sass": "3.4.1",
"bootswatch": "^3.3.7",
"broccoli-asset-rev": "^3.0.0",
"ember-ajax": "^5.0.0",
"ember-cli": "~3.5.1",
"ember-cli": "~3.6.1",
"ember-cli-clock": "^3.0.0",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-deploy": "^1.0.1",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-gzip": "^1.0.0",
"ember-cli-deploy-s3": "^1.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sass": "^10.0.1",
"ember-cli-sri": "^2.1.1",
Expand All @@ -74,7 +73,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^3.4.1",
"ember-resolver": "^7.0.0",
"ember-source": "~3.5.1",
"ember-source": "~3.6.0",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.0.0",
"ember-welcome-page": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.5.1",
"version": "3.6.1",
"blueprints": [
{
"name": "addon",
Expand Down
Loading

0 comments on commit 04be13a

Please sign in to comment.