Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

342 rename main script #347

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ bower install
This will copy the ui-tinymce files into your `components` folder, along with its dependencies. Load the script files in your application:

```html
<script type="text/javascript" src="app/bower_components/tinymce/tinymce.js"></script>
<script type="text/javascript" src="app/bower_components/tinymce/angular-ui-tinymce.js"></script>
<script type="text/javascript" src="app/bower_components/angular/angular.js"></script>
<script type="text/javascript" src="app/bower_components/angular-ui-tinymce/src/tinymce.js"></script>
<script type="text/javascript" src="app/bower_components/angular-ui-tinymce/src/angular-ui-tinymce.js"></script>
```

Add the tinymce module as a dependency to your application module:
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "https://github.com/angular-ui/ui-tinymce/graphs/contributors",
"license": "MIT",
"homepage": "http://angular-ui.github.com",
"main": "./src/tinymce.js",
"main": "./src/angular-ui-tinymce.js",
"ignore": [
"**/.*",
"node_modules",
Expand Down
4 changes: 2 additions & 2 deletions demo/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>AngularUI - TinyMCE Demo</title>
<script type="text/javascript" src="../bower_components/tinymce/tinymce.min.js"></script>
<script type="text/javascript" src="../bower_components/tinymce/angular-ui-tinymce.min.js"></script>
<script type="text/javascript" src="../bower_components/angular/angular.js"></script>
<script type="text/javascript" src="../src/tinymce.js"></script>
<script type="text/javascript" src="../src/angular-ui-tinymce.js"></script>
<script type="text/javascript" src="demo.js"></script>
</head>
<body ng-app="ui.tinymce" ng-controller="DemoCtrl as demo">
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion gruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = function (grunt) {
uglify: {
dist: {
files: {
'dist/tinymce.min.js': ['src/tinymce.js']
'dist/angular-ui-tinymce.min.js': ['src/angular-ui-tinymce.js']
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "https://github.com/angular-ui/ui-tinymce/graphs/contributors",
"license": "MIT",
"homepage": "http://angular-ui.github.com",
"main": "src/tinymce.js",
"main": "src/angular-ui-tinymce.js",
"dependencies": {},
"devDependencies": {
"grunt": "~1.0.1",
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module.exports = function (config) {
files: [
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/tinymce/tinymce.min.js',
'src/tinymce.js',
'bower_components/tinymce/angular-ui-tinymce.min.js',
'src/angular-ui-tinymce.js',
'test/*.spec.js',
{pattern: 'bower_components/tinymce/themes/**', included: false},
{pattern: 'bower_components/tinymce/skins/lightgray/**', included: false}
Expand Down