Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nakupanda/bootstrap3-dialog
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.32
Choose a base ref
...
head repository: nakupanda/bootstrap3-dialog
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 4,027 additions and 10,962 deletions.
  1. +4 −1 .gitignore
  2. 0 .npmignore
  3. +41 −1 README.md
  4. +4 −5 bower.json
  5. +110 −0 changelog.txt
  6. +15 −0 composer.json
  7. +66 −75 dist/css/bootstrap-dialog.css
  8. +1 −1 dist/css/bootstrap-dialog.min.css
  9. +666 −256 dist/js/bootstrap-dialog.js
  10. +1 −1 dist/js/bootstrap-dialog.min.js
  11. +1,926 −28 dist/less/bootstrap-dialog.less
  12. +0 −120 examples/assets/bootstrap-dialog/css/bootstrap-dialog.css
  13. +0 −1 examples/assets/bootstrap-dialog/css/bootstrap-dialog.min.css
  14. +0 −984 examples/assets/bootstrap-dialog/js/bootstrap-dialog.js
  15. +0 −1 examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js
  16. +0 −442 examples/assets/bootstrap/css/bootstrap-theme.css
  17. +0 −1 examples/assets/bootstrap/css/bootstrap-theme.css.map
  18. +0 −5 examples/assets/bootstrap/css/bootstrap-theme.min.css
  19. +0 −6,203 examples/assets/bootstrap/css/bootstrap.css
  20. +0 −1 examples/assets/bootstrap/css/bootstrap.css.map
  21. +0 −5 examples/assets/bootstrap/css/bootstrap.min.css
  22. BIN examples/assets/bootstrap/fonts/glyphicons-halflings-regular.eot
  23. +0 −229 examples/assets/bootstrap/fonts/glyphicons-halflings-regular.svg
  24. BIN examples/assets/bootstrap/fonts/glyphicons-halflings-regular.ttf
  25. BIN examples/assets/bootstrap/fonts/glyphicons-halflings-regular.woff
  26. +0 −2,114 examples/assets/bootstrap/js/bootstrap.js
  27. +0 −6 examples/assets/bootstrap/js/bootstrap.min.js
  28. +0 −6 examples/assets/jquery/jquery-1.10.2.min.js
  29. +0 −1 examples/assets/prettify/prettify.css
  30. +0 −34 examples/assets/prettify/run_prettify.js
  31. +192 −70 examples/index.html
  32. +30 −0 examples/play/append-to-div.html
  33. +44 −0 examples/play/button-event.html
  34. +26 −0 examples/play/custom-dialog-id.html
  35. +45 −0 examples/play/only-one-dialog.html
  36. +34 −0 examples/play/reopen-dialog.html
  37. +32 −0 examples/play/spinning-icon.html
  38. +28 −0 examples/play/tabindex.html
  39. +11 −9 gulpfile.js
  40. +5 −3 package.json
  41. +66 −75 src/css/bootstrap-dialog.css
  42. +666 −256 src/js/bootstrap-dialog.js
  43. +14 −28 src/less/bootstrap-dialog.less
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
nbproject
nbproject
node_modules
bower_components
/vendor/
Empty file added .npmignore
Empty file.
42 changes: 41 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
bootstrap-dialog
================

Make use of Bootstrap's modal more monkey-friendly.
[![Latest release](https://img.shields.io/github/release/nakupanda/bootstrap3-dialog.svg)](https://github.com/nakupanda/bootstrap3-dialog/releases/latest)

Make use of Bootstrap Modal more monkey-friendly.

See live examples here: <a href="http://nakupanda.github.io/bootstrap3-dialog/">http://nakupanda.github.io/bootstrap3-dialog/</a>

@@ -11,10 +13,48 @@ Thanks for [akinoniku](https://github.com/akinoniku)'s suggestions on dialog app

================

## Ask a question

It's recommended to provide online examples when asking questions or reporting bugs.
Fork this all-ready jsfiddle and start writing your example:
<a href="https://jsfiddle.net/o5k0eaws/1/">http://jsfiddle.net/o5k0eaws/1/</a>

================

## Use Guidances from contributors

<a href="https://gist.github.com/Genkilabs/bdcc5f62c5b46a8e0904">How to use bootstrap-dialog as Rails 4 confirm</a> - @[Genkilabs](https://github.com/Genkilabs)

<a href="https://github.com/nakupanda/bootstrap3-dialog/issues/364">How to use in ReactJS</a> - @[sonhan](https://github.com/sonhan)

================
## Reference to CDN

```
https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-dialog/1.34.7/css/bootstrap-dialog.min.css
https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-dialog/1.34.7/js/bootstrap-dialog.min.js
```
================

## Install using Bower

```
bower install bootstrap-dialog
```

Or

```
bower install bootstrap3-dialog
```

================

## Install using npm

```
npm install --save bootstrap3-dialog
```

================

9 changes: 4 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap3-dialog",
"description": "Make use of Twitter Bootstrap's modal more monkey-friendly. http://nakupanda.github.io/bootstrap3-dialog/",
"version": "1.28",
"description": "Make use of Bootstrap Modal more monkey-friendly. http://nakupanda.github.io/bootstrap3-dialog/",
"version": "1.35.4",
"keywords": [
"css",
"js",
@@ -15,11 +15,10 @@
"homepage": "http://nakupanda.github.io/bootstrap3-dialog/",
"main": [
"dist/less/bootstrap-dialog.less",
"dist/css/bootstrap-dialog.css",
"dist/css/bootstrap-dialog.min.css",
"dist/js/bootstrap-dialog.js",
"dist/js/bootstrap-dialog.min.js"
],
"license": "MIT",
"ignore": [
"source",
"spec",
@@ -33,7 +32,7 @@
"README.md"
],
"dependencies": {
"bootstrap": "~3.1.1",
"bootstrap": ">= 3.1.0",
"jquery": ">= 1.9.0"
}
}
110 changes: 110 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
LASTEST NOT RELEASED
------------------------------
* Merged #347 *

V1.35.4
------------------------------
* Refs #300 *
* Refs #308 *
* Refs #232 *
* Refs #334 *
* Refs #331 *

V1.35.3
------------------------------
* Refs #144 *
* Refs #284 *
* Refs #231 *
* Refs #271 *
* Refs #294 *

V1.35.2
------------------------------
* Refs #251 Close icon on the top right is configurable *
* Refs #249 *
* Refs #256 *

V1.35.1
------------------------------
* Refs #243 *

V1.35.0
------------------------------
* Refs #224 *
* Refs #208 *
* Refs #233 *
* Refs #247 *
* Refs #248 *

V1.34.9
------------------------------
* Fixed #221 *

V1.34.8
------------------------------
* Set 'realized' status to false when closing a 'autodestroy' dialog. *
* Merged #136 *
* Refs #210 *
* Merged #219 *

V1.34.7
------------------------------
* Refs #176 *
* Refs #109, Add methods getDialog(), setDialog() and addDialog() to BootstrapDialog. *
* Refs #201 *
* Refs #200 *

V1.34.6
------------------------------
* Refs #159 *
* Refs #160*
* Refs #179, removed local assets for example page, and used files hosted on CDN instead. *

V1.34.5
------------------------------
* Merged #137, Add missing less and remove stray css file in src folder *
* Tabindex is a customizable option now. *
* Refs #142 *
* Refs #145 *

V1.34.4
------------------------------
* Updated required Bootstrap version. *

V1.34.3
------------------------------
* Fixed #125, a bug that dialog footer won't be shown if it was hidden by a no button realization. *
* Refs #126. Adding a data 'button' to the created button. Passing original event object to button callback action(dialog, event). *
* Support Bootstrap v3.3.4

V1.34.2
------------------------------
* FIXED #102 *
* FIXED #121 *
* Implemented modal-sm, REFS #105 *
* More controls on confirm dialog, REFS #105 *
* Added I18N example *

V1.34.1
------------------------------
* Added more compatible methods to make BootstrapDialog works better with older version of Bootstrap Modal. *

V1.34.0
------------------------------
* FIXED #84 *
* Support Bootstrap Modal v3.3.0 *

V1.33.5
------------------------------
* PULL REQUEST: #72 *
* PULL REQUEST: #83 *
* Fixed a bug that after dragging the dialog to another place, the original place prevents closing the dialog by clicking on backdrop. *

V1.33.4
------------------------------
* RE-FIXED #56 *

V1.33.3
------------------------------
* FIXED #62 *
* IMPLEMENTED #67 *
15 changes: 15 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "cross-solution/bootstrap3-dialog",
"description": "Make use of Bootstrap Modal more monkey-friendly.",
"license": "MIT",
"authors": [
{
"name": "Nakupanda",
"email": "javanoob@hotmail.com"
}
],
"require": {
"components/jquery": "*",
"twbs/bootstrap": "3.*"
}
}
Loading