Merge branch 'develop'

showdownjs · Jan 6, 2015 · 0902600 · 0902600
2 parents bba2aef + bd24272
commit 0902600
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,8 @@
 language: node_js
 node_js:
-  - 0.6
-  - 0.8
+  - "0.8"
+  - "0.10"
+
+before_install:
+  - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
+  - npm install -g npm@latest
diff --git a/compressed/Showdown.js b/compressed/Showdown.js
diff --git a/compressed/Showdown.js.map b/compressed/Showdown.js.map
diff --git a/compressed/Showdown.min.js b/compressed/Showdown.min.js
diff --git a/compressed/extensions/github.min.js b/compressed/extensions/github.min.js
diff --git a/compressed/extensions/prettify.min.js b/compressed/extensions/prettify.min.js
diff --git a/compressed/extensions/table.min.js b/compressed/extensions/table.min.js
diff --git a/compressed/extensions/twitter.min.js b/compressed/extensions/twitter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "author": "John Fraser",
   "contributors": [
     "John Gruber",

diff --git a/src/ng-showdown.js b/src/ng-showdown.js
@@ -4,7 +4,7 @@
 
 
 //Check if AngularJs and Showdown is defined and only load ng-Showdown if both are present
-if (angular && Showdown) {
+if (typeof angular !== 'undefined'  && typeof Showdown !== 'undefined') {
 
     (function (module, Showdown) {