Skip to content

Commit

Permalink
Updated dependencies medium-editor and angular to latest stable versi…
Browse files Browse the repository at this point in the history
…ons; clean up Gruntfile
  • Loading branch information
thijsw committed Apr 12, 2015
1 parent 1a3e7e4 commit 230ed4d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 27 deletions.
10 changes: 1 addition & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Generated on 2013-11-10 using generator-angular-component 0.2.3
'use strict';

module.exports = function(grunt) {
Expand All @@ -17,7 +16,7 @@ module.exports = function(grunt) {
};

// Load all grunt tasks
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});

// Project configuration
grunt.initConfig({
Expand Down Expand Up @@ -150,13 +149,6 @@ module.exports = function(grunt) {
'uglify:dist'
]);

grunt.registerTask('release', [
'test',
'bump-only',
'dist',
'bump-commit'
]);

grunt.registerTask('default', ['build']);

};
13 changes: 4 additions & 9 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"name": "angular-medium-editor",
"version": "0.0.6",
"version": "0.1.0",
"dependencies": {
"angular": "latest",
"medium-editor": "1.8.*"
"angular": "1.3.*",
"medium-editor": "4.4.*"
},
"main": "./dist/angular-medium-editor.js",
"devDependencies": {
"angular": "latest",
"angular-mocks": "latest",
"medium-editor": "1.8.*"
}
"main": "./dist/angular-medium-editor.js"
}
2 changes: 1 addition & 1 deletion dist/angular-medium-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ angular.module('angular-medium-editor', [])
// in case options are provided after mediumEditor directive has been compiled and linked (and after $render function executed)
// we need to re-initialize
if (ctrl.editor) {
ctrl.editor.deactivate();
ctrl.editor.destroy();
}
prepOpts();
// Hide placeholder when the model is not empty
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-medium-editor.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-medium-editor",
"version": "0.0.6",
"version": "0.1.0",
"description": "AngularJS directive for Medium.com editor clone",
"keywords": [
"angular",
Expand All @@ -11,7 +11,7 @@
"author": {
"name": "Thijs Wijnmaalen",
"email": "[email protected]",
"url": "https://github.com/thijsw"
"url": "https://twitter.com/thijsw"
},
"repository": {
"type": "git",
Expand All @@ -33,10 +33,8 @@
"grunt-contrib-less": "^0.11.4",
"grunt-contrib-uglify": "^0.6.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-karma": "^0.9.0",
"grunt-ng-annotate": "0.4.0",
"grunt-open": "^0.2.3",
"karma": "^0.12.24",
"matchdep": "^0.3.0"
"load-grunt-tasks": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion src/angular-medium-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ angular.module('angular-medium-editor', [])
// in case options are provided after mediumEditor directive has been compiled and linked (and after $render function executed)
// we need to re-initialize
if (ctrl.editor) {
ctrl.editor.deactivate();
ctrl.editor.destroy();
}
prepOpts();
// Hide placeholder when the model is not empty
Expand Down

0 comments on commit 230ed4d

Please sign in to comment.