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

Doc refacto #12

Merged
merged 2 commits into from
Jul 29, 2013
Merged
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
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
components/
bower_components/
node_modules/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ before_install:
- npm install -g bower grunt-cli
- npm install
- bower install
before_script: components/angular-ui-docs/.travis/before_script.sh
after_success: components/angular-ui-docs/.travis/after_success.sh
before_script: bower_components/angular-ui-docs/.travis/before_script.sh
after_success: bower_components/angular-ui-docs/.travis/after_success.sh
branches:
only:
- master
Expand Down
47 changes: 1 addition & 46 deletions demo/demo.html
Original file line number Diff line number Diff line change
@@ -1,50 +1,5 @@

<script>

$("#codemirror").hide();
requireCss("components/codemirror/lib/codemirror.css");
requireCss("components/codemirror/theme/rubyblue.css");
requirejs(
{
paths: {
'ui.codemirror': "build/ui-codemirror.min"
},
shim: {
'ui.codemirror': { deps: ['components/codemirror/lib/codemirror'] }
}
},
['ui.codemirror'],
function () {

angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
.controller('CodemirrorCtrl', ['$scope', function ($scope) {
$scope.codeMirrorModel = "CodeMirror Hello World";
}])
;
e$ = $("#codemirror");
e$.removeAttr("ng-non-bindable");

angular.bootstrap(e$[0], ['doc.ui-codeMirror']);
e$.show();
$("#codemirror-l").slideUp();


}
);
</script>

<!-- Le loading
================================================== -->
<div id="codemirror-l" class="loadingAnimation" >
<div class="bowl_ringG">
<div class="ball_holderG">
<div class="ballG">
</div>
</div>
</div>
</div>

<section id="codemirror" ng-non-bindable ng-controller="CodemirrorCtrl">
<section id="codemirror" ng-app="doc.ui-codeMirror" ng-controller="CodemirrorCtrl">
<div class="page-header">
<h1>CodeMirror</h1>
</div>
Expand Down
5 changes: 5 additions & 0 deletions demo/demo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
.controller('CodemirrorCtrl', ['$scope', function ($scope) {
$scope.codeMirrorModel = "CodeMirror Hello World";
}])
22 changes: 16 additions & 6 deletions gruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ module.exports = function (grunt) {

// Project configuration.
grunt.initConfig({
dist : 'components/angular-ui-docs',
bower: 'bower_components',
dist : '<%= bower %>/angular-ui-docs',
pkg: grunt.file.readJSON('package.json'),
meta: {
banner: ['/**',
Expand All @@ -30,7 +31,17 @@ module.exports = function (grunt) {
''].join('\n'),
view : {
humaName : "UI CodeMirror",
repoName : "ui-codemirror"
repoName : "ui-codemirror",
demoHTML : grunt.file.read("demo/demo.html"),
demoJS : grunt.file.read("demo/demo.js"),
css : [
'<%= bower %>/codemirror/lib/codemirror.css',
'<%= bower %>/codemirror/theme/rubyblue.css'
],
js : [
'<%= bower %>/codemirror/lib/codemirror.js',
'build/ui-codemirror.min.js'
]
}
},
karma: {
Expand Down Expand Up @@ -63,10 +74,9 @@ module.exports = function (grunt) {
main: {
files: [
{src: ['<%= meta.view.repoName %>.js'], dest: '<%= dist %>/build/<%= meta.view.repoName %>.js', filter: 'isFile'},
{src: ['demo/demo.html'], dest: '<%= dist %>/demos.html', filter: 'isFile'},
{src: ['components/codemirror/lib/codemirror.js'], dest: '<%= dist %>/components/codemirror/lib/codemirror.js', filter: 'isFile'},
{src: ['components/codemirror/lib/codemirror.css'], dest: '<%= dist %>/components/codemirror/lib/codemirror.css', filter: 'isFile'},
{src: ['components/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/components/codemirror/theme/rubyblue.css', filter: 'isFile'}
{src: ['<%= bower %>/codemirror/lib/codemirror.js'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.js', filter: 'isFile'},
{src: ['<%= bower %>/codemirror/lib/codemirror.css'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.css', filter: 'isFile'},
{src: ['<%= bower %>/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/<%= bower %>/codemirror/theme/rubyblue.css', filter: 'isFile'}
]
},
template : {
Expand Down