Skip to content

Commit 7a872c9

Browse files
ZAYEC77ZAYEC77
committed
go to gulp && add wrapper directive"
1 parent d950fe3 commit 7a872c9

23 files changed

+224
-245
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
node_modules
21
.tmp
32
.idea
3+
node_modules
4+
build
45
app/vendors/*
6+
npm-debug.log

‎Gruntfile.js

-135
This file was deleted.

‎app/index.html

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
}
99
</style>
1010
<title></title>
11-
<!-- bower:css -->
1211
<link rel="stylesheet" href="vendors/bootstrap/dist/css/bootstrap.css" />
13-
<!-- endbower -->
1412
</head>
1513

1614
<body ng-app="app">
1715
<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
1816
<div class="container">
1917
<div class="navbar-header">
20-
<a href="../" class="navbar-brand">AngularFormus</a>
18+
<a href="/" class="navbar-brand">AngularFormus</a>
2119
</div>
2220
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
2321
<ul class="nav navbar-nav">
@@ -56,14 +54,14 @@
5654
</div>
5755
</div>
5856
</body>
59-
<!-- bower:js -->
6057
<script src="vendors/jquery/dist/jquery.js"></script>
6158
<script src="vendors/angular/angular.js"></script>
6259
<script src="vendors/bootstrap/dist/js/bootstrap.js"></script>
6360
<script src="vendors/lodash/dist/lodash.compat.js"></script>
64-
<!-- endbower -->
61+
6562
<script src="js/forms.js"></script>
6663
<script src="js/formus.js"></script>
64+
<script src="js/templates.js"></script>
6765
<script src="js/app.js"></script>
6866

6967
</html>

‎app/js/forms.js

+5
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,9 @@ var formsConfiguration = {
104104
}]
105105
}
106106
},
107+
secondForm: {
108+
fieldset:{
109+
110+
}
111+
}
107112
}

‎app/js/formus.js

+39-27
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
;(function( window, undefined ){
2-
'use strict';
1+
(function () {
32
/**
43
* @author Dmytro Karpovych
54
*/
65
var formus = angular.module('formus', []);
7-
;
6+
87
formus.provider('FormusConfig', function($logProvider) {
98
var getDefault = function() {
109
return {};
@@ -82,7 +81,7 @@ formus.provider('FormusConfig', function($logProvider) {
8281
$get: ['$log', getProvider]
8382
};
8483
});
85-
;
84+
8685
/**
8786
* Provide getter for forms configurations
8887
*/
@@ -127,7 +126,7 @@ formus.provider('FormusContainer', function() {
127126
}
128127
];
129128
});
130-
;
129+
131130
formus.directive('formusField', function($injector, $http, $compile, $log, $templateCache, FormusLinker, FormusValidator, FormusHelper) {
132131
return {
133132
transclude: true,
@@ -263,8 +262,8 @@ formus.directive('formusField', function($injector, $http, $compile, $log, $temp
263262
controller: function($scope, $element) {}
264263
};
265264
});
266-
;
267-
formus.directive('formusForm', function($q, FormusLinker) {
265+
266+
formus.directive('formusForm', function($q, FormusLinker, FormusTemplates) {
268267
return {
269268
transclude: true,
270269
replace: true,
@@ -276,7 +275,7 @@ formus.directive('formusForm', function($q, FormusLinker) {
276275
'model': '=',
277276
'config': '='
278277
},
279-
templateUrl: 'views/formus/form.html',
278+
templateUrl: FormusTemplates.getUrl('form'),
280279
link: function($scope, $element, $attr) {
281280
FormusLinker.formLinker({
282281
$scope: $scope,
@@ -326,7 +325,7 @@ formus.directive('formusForm', function($q, FormusLinker) {
326325
}
327326
};
328327
});
329-
;
328+
330329
/**
331330
* Service with specific functions
332331
*
@@ -440,7 +439,7 @@ formus.factory('FormusHelper', function() {
440439
extractBackendErrors: extractBackendErrors
441440
};
442441
});
443-
;
442+
444443
/**
445444
* Provide container for directives linkers
446445
*/
@@ -511,7 +510,8 @@ formus.provider('FormusLinker', function() {
511510
var linkers = {
512511
loadTemplate: loadTemplateLinker,
513512
default: defaultLinker,
514-
form: formLinker
513+
form: formLinker,
514+
wrapperLinker: loadTemplateLinker
515515
};
516516

517517
function getLinker(injector, log) {
@@ -542,25 +542,25 @@ formus.provider('FormusLinker', function() {
542542
]
543543
};
544544
});
545-
;
545+
546546
/**
547547
* Provide container for templates by input types
548548
*/
549549
formus.provider('FormusTemplates', function() {
550550
var q, cache, http, log;
551551
var templateMap = {
552-
radio: 'views/formus/inputs/radio.html',
553-
checkbox: 'views/formus/inputs/checkbox.html',
554-
checklist: 'views/formus/inputs/checklist.html',
555-
hidden: 'views/formus/inputs/hidden.html',
556-
select: 'views/formus/inputs/select.html',
557-
textarea: 'views/formus/inputs/textarea.html',
558-
textbox: 'views/formus/inputs/textbox.html',
559-
fieldset: 'views/formus/inputs/fieldset.html',
560-
message: 'views/formus/inputs/message.html',
561-
datetime: 'views/formus/inputs/datetime.html',
562-
label: 'views/formus/inputs/label.html',
563-
ckeditor: 'views/formus/inputs/ckeditor.html'
552+
form: 'formus/form.html',
553+
wrapper: 'formus/inputs/wrapper.html',
554+
radio: 'formus/inputs/radio.html',
555+
checkbox: 'formus/inputs/checkbox.html',
556+
checklist: 'formus/inputs/checklist.html',
557+
hidden: 'formus/inputs/hidden.html',
558+
select: 'formus/inputs/select.html',
559+
textarea: 'formus/inputs/textarea.html',
560+
textbox: 'formus/inputs/textbox.html',
561+
fieldset: 'formus/inputs/fieldset.html',
562+
message: 'formus/inputs/message.html',
563+
label: 'formus/inputs/label.html',
564564
};
565565

566566
/**
@@ -630,13 +630,13 @@ formus.provider('FormusTemplates', function() {
630630
has: has,
631631
get: get,
632632
load: load,
633-
getTemplateUrl: getTemplateUrl
633+
getUrl: getTemplateUrl
634634
};
635635
}
636636
]
637637
};
638638
});
639-
;
639+
640640
formus.provider('FormusValidator', function($logProvider) {
641641
var validators = {
642642
required: function(value, config) {
@@ -678,4 +678,16 @@ formus.provider('FormusValidator', function($logProvider) {
678678
};
679679
});
680680

681-
}( window ));
681+
formus.directive('formusWrapper', function(FormusTemplates, FormusLinker, $timeout) {
682+
return {
683+
restrict: 'AE',
684+
transclude: true,
685+
replace: true,
686+
scope:true,
687+
templateUrl: FormusTemplates.getUrl('wrapper'),
688+
link: function($scope, $element, $attr) {
689+
},
690+
controller: function($scope, $element) {}
691+
};
692+
});
693+
})();

‎app/js/templates.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/views/formus/inputs/fieldset.html

-5
This file was deleted.

‎app/views/formus/inputs/textbox.html

-6
This file was deleted.

0 commit comments

Comments
 (0)