Skip to content
This repository was archived by the owner on Oct 22, 2025. It is now read-only.

Commit 2be7453

Browse files
committed
Merge pull request #168 from dgsmith2/npm-fix
Align with npm spec for "main"
2 parents 4229f03 + d5df098 commit 2be7453

5 files changed

Lines changed: 16 additions & 18 deletions

File tree

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"README.md"
3434
],
3535
"dependencies": {
36-
"bootstrap": "^3.x",
36+
"bootstrap": "~3.3.5",
3737
"angular": "^1.5",
3838
"angular-sanitize": "^1.5",
3939
"angular-bootstrap": "^1.1.2",

example/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="row">
2727
<div class="col-md-12">
2828
<h1>Dialog Service Demo (v5.3)</h1>
29-
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.4.9, Angular UI Bootstrap 1.1.2, Angular-Translate 2.8,1)</p>
29+
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.5.0, Angular UI Bootstrap 1.1.2, Angular-Translate 2.8,1)</p>
3030
<p>Demo of Angular dialog service using Bootstrap 3 with Angular and Angular UI Bootstrap's modal service.</p>
3131
<p>As well as the use of <a href="https://github.com/angular-translate">Angular-Translate (https://github.com/angular-translate)</a></p><br>
3232
</div>

example/index2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div class="row">
2626
<div class="col-md-12">
2727
<h1>Dialog Service Demo (v5.3) <span class="text-muted"><small>Sans Angular-Translate</small></span></h1>
28-
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.4.9, Angular UI Bootstrap 1.1.2)</p>
28+
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.5.0, Angular UI Bootstrap 1.1.2)</p>
2929
<p>This Demo of Angular-Dialog-Service <strong>features an automatic substitution for Angular-Translate</strong>. It will detect whether or not Angular-Translate is loaded; if not it will use the included translate substitute (translate.sub) module. The translate substitution is small and modeled after Angular-Translate so that if in the future you wish to use Angular-Translate all you need to do is load the module (pascalprecht.translate) before this dialogs module.</p>
3030
<p>The result, <a href="https://github.com/angular-translate">Angular-Translate (https://github.com/angular-translate)</a> <strong>is now optional</strong>, its no longer an absolute dependency. If your application does not need a translation module then there is no need to include Angular-Translate anymore. You can however still set default modal button, header and message text via <em>$translateProvider</em> in your module's <em>config</em> function.</p><br>
3131
</div>

index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
require('./dist/dialogs.min.js');
2-
require('./dist/dialogs-default-translations.min.js');
1+
require('./dist/dialogs.js');
2+
require('./dist/dialogs-default-translations.js');
3+
require('./dist/dialogs.css');
34
module.exports = 'dialogs.main';

package.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,19 @@
1919
"type": "git",
2020
"url": "git://github.com/m-e-conroy/angular-dialog-service"
2121
},
22-
"main": [
23-
"./dist/dialogs.min.css",
24-
"./index.js"
25-
],
22+
"main": "index.js",
2623
"devDependencies": {
2724
"gulp": "^3.9.0",
28-
"gulp-bump": "^0.3.1",
29-
"gulp-concat": "^2.4.1",
25+
"gulp-bump": "^1.0.0",
26+
"gulp-concat": "^2.6.0",
3027
"gulp-connect": "^2.2.0",
31-
"gulp-header": "^1.2.2",
32-
"gulp-jshint": "^1.8.4",
33-
"gulp-minify": "0.0.3",
34-
"gulp-minify-css": "^0.3.10",
35-
"gulp-rename": "^1.2.0",
36-
"gulp-util": "^3.0.5",
37-
"gulp-wrap": "^0.3.0",
28+
"gulp-header": "^1.7.1",
29+
"gulp-jshint": "^1.11.2",
30+
"gulp-minify": "0.0.5",
31+
"gulp-minify-css": "^1.2.1",
32+
"gulp-rename": "^1.2.2",
33+
"gulp-util": "^3.0.6",
34+
"gulp-wrap": "^0.11.0",
3835
"jasmine-core": "^2.3.4",
3936
"karma": "^0.13.10",
4037
"karma-jasmine": "^0.3.6",

0 commit comments

Comments
 (0)