Skip to content

Commit

Permalink
Merge pull request #59 from Rovak/hotfix/58
Browse files Browse the repository at this point in the history
fix angularjs demo error, fixes #58
  • Loading branch information
Rovak committed May 28, 2015
2 parents aa2e21d + 7c7dd1c commit 8157a6d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = function(grunt) {
dest: 'dist/codemirror-4.inline-attachment.js'
},
angularjs: {
src: ['<banner>', 'src/inline-attachment.js', 'src/angularjs.inline-attachment.js'],
src: ['<banner>', 'src/inline-attachment.js', 'src/input.inline-attachment.js', 'src/angularjs.inline-attachment.js'],
dest: 'dist/angularjs.inline-attachment.js'
}
},
Expand Down Expand Up @@ -93,4 +93,4 @@ module.exports = function(grunt) {

grunt.registerTask('qa', ['jshint']);
grunt.registerTask('default', ['qa', 'concat', 'uglify']);
};
};
1 change: 1 addition & 0 deletions demo/angularjs.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script>

<script src="../src/inline-attachment.js"></script>
<script src="../src/input.inline-attachment.js"></script>
<script src="../src/angularjs.inline-attachment.js"></script>
<script type="text/javascript">
function textAreaCtrl($scope) {
Expand Down
4 changes: 2 additions & 2 deletions src/angularjs.inline-attachment.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
module.directive(attrName, function() {
return function(scope, element, attrs) {
var options = readParameters(attrs, scope);
inlineAttachment.attachToInput(element.context, options);
inlineAttachment.editors.input.attachToInput(element.context, options);
};
});
})(document, window, angular);
})(document, window, angular);

0 comments on commit 8157a6d

Please sign in to comment.