prevent angular being loaded twice when using with browserify (#474)

Ming Chan · ValentinH · commit cc59defaa4ad · 2016-12-11T11:29:12.000+01:00
* prevent angular being loaded twice when using with browserify

* build release
diff --git a/dist/rzslider.css b/dist/rzslider.css
@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.7 - 
  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-09 */
+ 2016-12-08 */
 .rzslider {
   position: relative;
   display: inline-block;
diff --git a/dist/rzslider.js b/dist/rzslider.js
@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.7 - 
  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-09 */
+ 2016-12-08 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
@@ -15,7 +15,7 @@
     // only CommonJS-like environments that support module.exports,
     // like Node.
     // to support bundler like browserify
-    var angularObj = require('angular');
+    var angularObj = angular || require('angular');
     if ((!angularObj || !angularObj.module) && typeof angular != 'undefined') {
       angularObj = angular;
     }
diff --git a/dist/rzslider.min.css b/dist/rzslider.min.css
diff --git a/dist/rzslider.min.js b/dist/rzslider.min.js
diff --git a/dist/rzslider.scss b/dist/rzslider.scss
@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.7 - 
  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-09 */
+ 2016-12-08 */
 .rzslider {
   position: relative;
   display: inline-block;
diff --git a/src/rzslider.js b/src/rzslider.js
@@ -19,7 +19,7 @@
     // only CommonJS-like environments that support module.exports,
     // like Node.
     // to support bundler like browserify
-    var angularObj = require('angular');
+    var angularObj = angular || require('angular');
     if ((!angularObj || !angularObj.module) && typeof angular != 'undefined') {
       angularObj = angular;
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`// only CommonJS-like environments that support module.exports,`
`20`	`20`	`// like Node.`
`21`	`21`	`// to support bundler like browserify`
`22`		`- var angularObj = require('angular');`
	`22`	`+ var angularObj = angular \|\| require('angular');`
`23`	`23`	`if ((!angularObj \|\| !angularObj.module) && typeof angular != 'undefined') {`
`24`	`24`	`angularObj = angular;`
`25`	`25`	`}`