Issue with Kama.conf.js

Hypercubed · Jan 21, 2014 · 5e32335 · 5e32335
1 parent fe45663
commit 5e32335
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/angular-marked.js b/angular-marked.js
@@ -13,12 +13,7 @@
 
   var app = angular.module('hc.marked', []);
 
-  app.constant('marked', marked);
-
-  // Maybe this is better?
-  //app.service('marked', ['$window', function($window) {
-  //	return $window.marked;
-  //}]);
+  app.constant('marked', window.marked);
 
   // TODO: filter tests */
   //app.filter('marked', ['marked', function(marked) {
@@ -35,12 +30,17 @@
       },
       link: function (scope, element, attrs) {
         var value = scope.marked || element.text() || '';
-        element.html(marked(value, scope.opts || null));
+        set();
 
-        if (attrs.marked)
+        function set() {
+        	element.html(marked(value, scope.opts || null));
+        }
+
+        if (attrs.marked) {
           scope.$watch('marked', function(value) {
             element.html(marked(value || '', scope.opts || null));
-          });
+          });        	
+        }
 
       }
     };

diff --git a/karma.conf.js b/karma.conf.js
@@ -15,8 +15,8 @@ module.exports = function(config) {
     files: [
       'bower_components/angular/angular.js',
       'bower_components/angular-mocks/angular-mocks.js',
-      'angular-marked.js',
       'bower_components/marked/lib/marked.js',
+      'angular-marked.js',
       'test/spec/**/*.js'
     ],