Skip to content

Commit 1ec1857

Browse files
MacKentochMacKentoch
committed
fix : pageslide bower conflict
1 parent 1f39994 commit 1ec1857

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1015
-77
lines changed

‎EasyFormGenerator-DragAndDropWay-DEMO.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
])
4848
.controller('demoController', demoController);
4949

50-
demoController.$inject = ['$timeout'];
51-
function demoController($timeout){
50+
demoController.$inject = [];
51+
function demoController(){
5252
var demoCtrl = this;
5353

5454
demoCtrl.easyFormGeneratorModel = {};
@@ -100,7 +100,6 @@
100100
<script type="text/javascript" src='../lodash/lodash.min.js'></script>
101101
<script type="text/javascript" src="../angular-strap/dist/angular-strap.min.js"></script>
102102
<script type="text/javascript" src="../angular-strap/dist/angular-strap.tpl.min.js"></script>
103-
<script type="text/javascript" src="../angular-pageslide-directive/dist/angular-pageslide-directive.min.js"></script>
104103
<script type="text/javascript" src="../angular-animate/angular-animate.min.js"></script>
105104
<script type="text/javascript" src="../angular-translate/angular-translate.min.js"></script>
106105
<script type="text/javascript" src="../angularjs-toaster/toaster.min.js"></script>

‎bower.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"./dist/js/eda.stepway.min.js",
55
"./dist/css/eda.stepway.min.css"
66
],
7-
"version": "1.0.30",
7+
"version": "1.0.31",
88
"description": "create amazing forms without coding : form editor based on angular formly",
99
"keywords": [
1010
"easy",
@@ -67,13 +67,12 @@
6767
"nya-bootstrap-select": "~2.0.10",
6868
"lodash": "~3.9.3",
6969
"angular-strap": "~2.3.0",
70-
"angular-translate": "~2.8.1",
71-
"angular-pageslide-directive": "~1.0.5"
70+
"angular-translate": "~2.8.1"
7271
},
7372
"devDependencies": {
7473
"angular-mocks": "~1.4.1"
7574
},
7675
"resolutions": {
77-
"angular": "1.4.7"
76+
"angular": "^1.4.7"
7877
}
7978
}

‎dist/css/eda.dragdropway.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* easyFormGenerator — drag and drop way — version
3-
* Version 1.0.29
3+
* Version 1.0.31
44
* Author : Erwan Datin (MacKentoch)
55
*Link: https://github.com/MacKentoch/easyFormGenerator
66
* License : 2015 MIT

‎dist/css/eda.dragdropway.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/eda.easyFormViewer.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* easyFormViewer
3-
* Version 1.0.29
3+
* Version 1.0.31
44
* Author : Erwan Datin (MacKentoch)
55
*Link: https://github.com/MacKentoch/easyFormGenerator
66
* License : 2015 MIT

‎dist/css/eda.easyFormViewer.min.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* easyFormViewer
3-
* Version 1.0.29
3+
* Version 1.0.31
44
* Author : Erwan Datin (MacKentoch)
55
*Link: https://github.com/MacKentoch/easyFormGenerator
66
* License : 2015 MIT

‎dist/css/eda.stepway.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* easyFormGenerator — step way — version
3-
* Version 1.0.29
3+
* Version 1.0.31
44
* Author : Erwan Datin (MacKentoch)
55
*Link: https://github.com/MacKentoch/easyFormGenerator
66
* License : 2015 MIT

‎dist/css/eda.stepway.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index_DragDropWay.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,8 @@ <h6 class="text-right">Easy form generator : {{easyFormGeneratorVERSION}} — Er
556556
<script type="text/javascript" src="./public/lib/js/angular-strap.min.js"></script>
557557
<script type="text/javascript" src="./public/lib/js/angular-strap.tpl.min.js"></script>
558558

559-
560559
<script type="text/javascript" src="./public/lib/js/angular-resource.min.js"></script>
561560

562-
<!-- angular pageSlide directive -->
563-
<script type="text/javascript" src="./public/lib/js/angular-pageslide-directive.min.js"></script>
564-
565561
<!-- angular animate -->
566562
<script type="text/javascript" src="./public/lib/js/angular-animate.min.js"></script>
567563
<!-- angular toaster -->

‎dist/index_DragDropWay_As_Module.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,17 +411,13 @@
411411

412412

413413
<script type="text/javascript" src="./public/lib/js/angular-resource.min.js"></script>
414-
<!-- angular pageSlide directive -->
415-
<script type="text/javascript" src="./public/lib/js/angular-pageslide-directive.min.js"></script>
416-
417414
<!-- angular animate -->
418415
<script type="text/javascript" src="./public/lib/js/angular-animate.min.js"></script>
419416
<!-- angular toaster -->
420417
<script type="text/javascript" src="./public/lib/js/toaster.min.js"></script>
421418
<!-- nya select bootstrap -->
422419
<script type="text/javascript" src="./public/lib/js/nya-bs-select.min.js"></script>
423-
<!-- angular-drag-drop-lists -->
424-
<script type="text/javascript" src="./public/lib/js/angular-drag-and-drop-lists.min.js"></script>
420+
425421
<!-- api-check = formly needed : IMPORTANT : always before formly -->
426422
<script type="text/javascript" src="./public/lib/js/api-check.min.js"></script>
427423
<!-- angular formly -->

0 commit comments

Comments
 (0)