Skip to content
This repository was archived by the owner on May 25, 2019. It is now read-only.

Commit ca904e9

Browse files
committed
Merge pull request #12 from douglasduteil/ft-doc-t1
Doc refacto
2 parents 9b8dfdc + 3047fc0 commit ca904e9

File tree

6 files changed

+25
-58
lines changed

6 files changed

+25
-58
lines changed

.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
components/
1+
bower_components/
22
node_modules/

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ before_install:
88
- npm install -g bower grunt-cli
99
- npm install
1010
- bower install
11-
before_script: components/angular-ui-docs/.travis/before_script.sh
12-
after_success: components/angular-ui-docs/.travis/after_success.sh
11+
before_script: bower_components/angular-ui-docs/.travis/before_script.sh
12+
after_success: bower_components/angular-ui-docs/.travis/after_success.sh
1313
branches:
1414
only:
1515
- master

demo/demo.html

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
11

2-
<script>
3-
4-
$("#codemirror").hide();
5-
requireCss("components/codemirror/lib/codemirror.css");
6-
requireCss("components/codemirror/theme/rubyblue.css");
7-
requirejs(
8-
{
9-
paths: {
10-
'ui.codemirror': "build/ui-codemirror.min"
11-
},
12-
shim: {
13-
'ui.codemirror': { deps: ['components/codemirror/lib/codemirror'] }
14-
}
15-
},
16-
['ui.codemirror'],
17-
function () {
18-
19-
angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
20-
.controller('CodemirrorCtrl', ['$scope', function ($scope) {
21-
$scope.codeMirrorModel = "CodeMirror Hello World";
22-
}])
23-
;
24-
e$ = $("#codemirror");
25-
e$.removeAttr("ng-non-bindable");
26-
27-
angular.bootstrap(e$[0], ['doc.ui-codeMirror']);
28-
e$.show();
29-
$("#codemirror-l").slideUp();
30-
31-
32-
}
33-
);
34-
</script>
35-
36-
<!-- Le loading
37-
================================================== -->
38-
<div id="codemirror-l" class="loadingAnimation" >
39-
<div class="bowl_ringG">
40-
<div class="ball_holderG">
41-
<div class="ballG">
42-
</div>
43-
</div>
44-
</div>
45-
</div>
46-
47-
<section id="codemirror" ng-non-bindable ng-controller="CodemirrorCtrl">
2+
<section id="codemirror" ng-app="doc.ui-codeMirror" ng-controller="CodemirrorCtrl">
483
<div class="page-header">
494
<h1>CodeMirror</h1>
505
</div>

demo/demo.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
3+
.controller('CodemirrorCtrl', ['$scope', function ($scope) {
4+
$scope.codeMirrorModel = "CodeMirror Hello World";
5+
}])

gruntFile.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ module.exports = function (grunt) {
1818

1919
// Project configuration.
2020
grunt.initConfig({
21-
dist : 'components/angular-ui-docs',
21+
bower: 'bower_components',
22+
dist : '<%= bower %>/angular-ui-docs',
2223
pkg: grunt.file.readJSON('package.json'),
2324
meta: {
2425
banner: ['/**',
@@ -30,7 +31,17 @@ module.exports = function (grunt) {
3031
''].join('\n'),
3132
view : {
3233
humaName : "UI CodeMirror",
33-
repoName : "ui-codemirror"
34+
repoName : "ui-codemirror",
35+
demoHTML : grunt.file.read("demo/demo.html"),
36+
demoJS : grunt.file.read("demo/demo.js"),
37+
css : [
38+
'<%= bower %>/codemirror/lib/codemirror.css',
39+
'<%= bower %>/codemirror/theme/rubyblue.css'
40+
],
41+
js : [
42+
'<%= bower %>/codemirror/lib/codemirror.js',
43+
'build/ui-codemirror.min.js'
44+
]
3445
}
3546
},
3647
karma: {
@@ -63,10 +74,9 @@ module.exports = function (grunt) {
6374
main: {
6475
files: [
6576
{src: ['<%= meta.view.repoName %>.js'], dest: '<%= dist %>/build/<%= meta.view.repoName %>.js', filter: 'isFile'},
66-
{src: ['demo/demo.html'], dest: '<%= dist %>/demos.html', filter: 'isFile'},
67-
{src: ['components/codemirror/lib/codemirror.js'], dest: '<%= dist %>/components/codemirror/lib/codemirror.js', filter: 'isFile'},
68-
{src: ['components/codemirror/lib/codemirror.css'], dest: '<%= dist %>/components/codemirror/lib/codemirror.css', filter: 'isFile'},
69-
{src: ['components/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/components/codemirror/theme/rubyblue.css', filter: 'isFile'}
77+
{src: ['<%= bower %>/codemirror/lib/codemirror.js'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.js', filter: 'isFile'},
78+
{src: ['<%= bower %>/codemirror/lib/codemirror.css'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.css', filter: 'isFile'},
79+
{src: ['<%= bower %>/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/<%= bower %>/codemirror/theme/rubyblue.css', filter: 'isFile'}
7080
]
7181
},
7282
template : {

0 commit comments

Comments
 (0)