Skip to content

Commit

Permalink
fix : pageslide bower conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@MacKentoch
MacKentoch committed Oct 21, 2015
1 parent 1f39994 commit 1ec1857
Show file tree
Hide file tree
Showing 49 changed files with 1,015 additions and 77 deletions.
5 changes: 2 additions & 3 deletions EasyFormGenerator-DragAndDropWay-DEMO.html
View file
Expand Up @@ -47,8 +47,8 @@
])
.controller('demoController', demoController);

demoController.$inject = ['$timeout'];
function demoController($timeout){
demoController.$inject = [];
function demoController(){
var demoCtrl = this;

demoCtrl.easyFormGeneratorModel = {};
Expand Down Expand Up @@ -100,7 +100,6 @@
<script type="text/javascript" src='../lodash/lodash.min.js'></script>
<script type="text/javascript" src="../angular-strap/dist/angular-strap.min.js"></script>
<script type="text/javascript" src="../angular-strap/dist/angular-strap.tpl.min.js"></script>
<script type="text/javascript" src="../angular-pageslide-directive/dist/angular-pageslide-directive.min.js"></script>
<script type="text/javascript" src="../angular-animate/angular-animate.min.js"></script>
<script type="text/javascript" src="../angular-translate/angular-translate.min.js"></script>
<script type="text/javascript" src="../angularjs-toaster/toaster.min.js"></script>
Expand Down
7 changes: 3 additions & 4 deletions bower.json
View file
Expand Up @@ -4,7 +4,7 @@
"./dist/js/eda.stepway.min.js",
"./dist/css/eda.stepway.min.css"
],
"version": "1.0.30",
"version": "1.0.31",
"description": "create amazing forms without coding : form editor based on angular formly",
"keywords": [
"easy",
Expand Down Expand Up @@ -67,13 +67,12 @@
"nya-bootstrap-select": "~2.0.10",
"lodash": "~3.9.3",
"angular-strap": "~2.3.0",
"angular-translate": "~2.8.1",
"angular-pageslide-directive": "~1.0.5"
"angular-translate": "~2.8.1"
},
"devDependencies": {
"angular-mocks": "~1.4.1"
},
"resolutions": {
"angular": "1.4.7"
"angular": "^1.4.7"
}
}
2 changes: 1 addition & 1 deletion dist/css/eda.dragdropway.css
View file
@@ -1,6 +1,6 @@
/*!
* easyFormGenerator — drag and drop way — version
* Version 1.0.29
* Version 1.0.31
* Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
* License : 2015 MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/css/eda.dragdropway.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/eda.easyFormViewer.css
View file
@@ -1,6 +1,6 @@
/*!
* easyFormViewer
* Version 1.0.29
* Version 1.0.31
* Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
* License : 2015 MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/css/eda.easyFormViewer.min.css
View file
@@ -1,6 +1,6 @@
/*!
* easyFormViewer
* Version 1.0.29
* Version 1.0.31
* Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
* License : 2015 MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/css/eda.stepway.css
View file
@@ -1,6 +1,6 @@
/*!
* easyFormGenerator — step way — version
* Version 1.0.29
* Version 1.0.31
* Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
* License : 2015 MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/css/eda.stepway.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions dist/index_DragDropWay.html
View file
Expand Up @@ -556,12 +556,8 @@ <h6 class="text-right">Easy form generator : {{easyFormGeneratorVERSION}} — Er
<script type="text/javascript" src="./public/lib/js/angular-strap.min.js"></script>
<script type="text/javascript" src="./public/lib/js/angular-strap.tpl.min.js"></script>


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

<!-- angular pageSlide directive -->
<script type="text/javascript" src="./public/lib/js/angular-pageslide-directive.min.js"></script>

<!-- angular animate -->
<script type="text/javascript" src="./public/lib/js/angular-animate.min.js"></script>
<!-- angular toaster -->
Expand Down
6 changes: 1 addition & 5 deletions dist/index_DragDropWay_As_Module.html
View file
Expand Up @@ -411,17 +411,13 @@


<script type="text/javascript" src="./public/lib/js/angular-resource.min.js"></script>
<!-- angular pageSlide directive -->
<script type="text/javascript" src="./public/lib/js/angular-pageslide-directive.min.js"></script>

<!-- angular animate -->
<script type="text/javascript" src="./public/lib/js/angular-animate.min.js"></script>
<!-- angular toaster -->
<script type="text/javascript" src="./public/lib/js/toaster.min.js"></script>
<!-- nya select bootstrap -->
<script type="text/javascript" src="./public/lib/js/nya-bs-select.min.js"></script>
<!-- angular-drag-drop-lists -->
<script type="text/javascript" src="./public/lib/js/angular-drag-and-drop-lists.min.js"></script>

<!-- api-check = formly needed : IMPORTANT : always before formly -->
<script type="text/javascript" src="./public/lib/js/api-check.min.js"></script>
<!-- angular formly -->
Expand Down
243 changes: 241 additions & 2 deletions dist/js/eda.dragdropway.js
View file
@@ -1,6 +1,6 @@
/**
*easyFormGenerator — drag and drop way — version
*Version 1.0.29
*Version 1.0.31
*Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
*License : MIT (2015)
Expand Down Expand Up @@ -50,7 +50,7 @@ angular
'pageslide-directive'
])

.value('easyFormGenVersion', 'v1.0.30')
.value('easyFormGenVersion', 'v1.0.31')
.run(runfct);


Expand Down Expand Up @@ -9188,4 +9188,243 @@ angular.module('dndLists', [])

})();

angular.module('pageslide-directive', [])

.directive('pageslide', [
function () {
var defaults = {};

/* Return directive definition object */

return {
restrict: 'EAC',
transclude: false,
scope: {
psOpen: '=?',
psAutoClose: '=?',
psSide: '@',
psSpeed: '@',
psClass: '@',
psSize: '@',
psSqueeze: '@',
psCloak: '@',
psPush: '@',
psContainer: '@'
},
//template: '<div class="pageslide-content" ng-transclude></div>',
link: function ($scope, el, attrs) {
/* Inspect */
//console.log($scope);
//console.log(el);
//console.log(attrs);

/* Parameters */
var param = {};

param.side = $scope.psSide || 'right';
param.speed = $scope.psSpeed || '0.5';
param.size = $scope.psSize || '300px';
param.zindex = 1000; // Override with custom CSS
param.className = $scope.psClass || 'ng-pageslide';
param.cloak = $scope.psCloak && $scope.psCloak.toLowerCase() == 'false' ? false : true;
param.squeeze = Boolean($scope.psSqueeze) || false;
param.push = Boolean($scope.psPush) || false;
param.container = $scope.psContainer || false;

// Apply Class
el.addClass(param.className);

/* DOM manipulation */
var content = null;
var slider = null;
var body = param.container ? document.getElementById(param.container) : document.body;

slider = el[0];

// Check for div tag
if (slider.tagName.toLowerCase() !== 'div' &&
slider.tagName.toLowerCase() !== 'pageslide')
throw new Error('Pageslide can only be applied to <div> or <pageslide> elements');

// Check for content
if (slider.children.length === 0)
throw new Error('You have to content inside the <pageslide>');

content = angular.element(slider.children);

/* Append */
body.appendChild(slider);

/* Style setup */
slider.style.zIndex = param.zindex;
slider.style.position = param.container !== false ? 'absolute' : 'fixed';
slider.style.width = 0;
slider.style.height = 0;
slider.style.overflow = 'hidden';
slider.style.transitionDuration = param.speed + 's';
slider.style.webkitTransitionDuration = param.speed + 's';
slider.style.transitionProperty = 'width, height';
if (param.squeeze) {
body.style.position = 'absolute';
body.style.transitionDuration = param.speed + 's';
body.style.webkitTransitionDuration = param.speed + 's';
body.style.transitionProperty = 'top, bottom, left, right';
}

switch (param.side) {
case 'right':
slider.style.height = attrs.psCustomHeight || '100%';
slider.style.top = attrs.psCustomTop || '0px';
slider.style.bottom = attrs.psCustomBottom || '0px';
slider.style.right = attrs.psCustomRight || '0px';
break;
case 'left':
slider.style.height = attrs.psCustomHeight || '100%';
slider.style.top = attrs.psCustomTop || '0px';
slider.style.bottom = attrs.psCustomBottom || '0px';
slider.style.left = attrs.psCustomLeft || '0px';
break;
case 'top':
slider.style.width = attrs.psCustomWidth || '100%';
slider.style.left = attrs.psCustomLeft || '0px';
slider.style.top = attrs.psCustomTop || '0px';
slider.style.right = attrs.psCustomRight || '0px';
break;
case 'bottom':
slider.style.width = attrs.psCustomWidth || '100%';
slider.style.bottom = attrs.psCustomBottom || '0px';
slider.style.left = attrs.psCustomLeft || '0px';
slider.style.right = attrs.psCustomRight || '0px';
break;
}


/* Closed */
function psClose(slider, param) {
if (slider && slider.style.width !== 0 && slider.style.width !== 0) {
if (param.cloak) content.css('display', 'none');
switch (param.side) {
case 'right':
slider.style.width = '0px';
if (param.squeeze) body.style.right = '0px';
if (param.push) {
body.style.right = '0px';
body.style.left = '0px';
}
break;
case 'left':
slider.style.width = '0px';
if (param.squeeze) body.style.left = '0px';
if (param.push) {
body.style.left = '0px';
body.style.right = '0px';
}
break;
case 'top':
slider.style.height = '0px';
if (param.squeeze) body.style.top = '0px';
if (param.push) {
body.style.top = '0px';
body.style.bottom = '0px';
}
break;
case 'bottom':
slider.style.height = '0px';
if (param.squeeze) body.style.bottom = '0px';
if (param.push) {
body.style.bottom = '0px';
body.style.top = '0px';
}
break;
}
}
$scope.psOpen = false;
}

/* Open */
function psOpen(slider, param) {
if (slider.style.width !== 0 && slider.style.width !== 0) {
switch (param.side) {
case 'right':
slider.style.width = param.size;
if (param.squeeze) body.style.right = param.size;
if (param.push) {
body.style.right = param.size;
body.style.left = '-' + param.size;
}
break;
case 'left':
slider.style.width = param.size;
if (param.squeeze) body.style.left = param.size;
if (param.push) {
body.style.left = param.size;
body.style.right = '-' + param.size;
}
break;
case 'top':
slider.style.height = param.size;
if (param.squeeze) body.style.top = param.size;
if (param.push) {
body.style.top = param.size;
body.style.bottom = '-' + param.size;
}
break;
case 'bottom':
slider.style.height = param.size;
if (param.squeeze) body.style.bottom = param.size;
if (param.push) {
body.style.bottom = param.size;
body.style.top = '-' + param.size;
}
break;
}
setTimeout(function() {
if (param.cloak) content.css('display', 'block');
}, (param.speed * 1000));

}
}

function isFunction(functionToCheck) {
var getType = {};
return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
}

/*
* Watchers
* */

$scope.$watch('psOpen', function(value) {
if (!!value) {
// Open
psOpen(slider, param);
} else {
// Close
psClose(slider, param);
}
});


/*
* Events
* */

$scope.$on('$destroy', function () {
body.removeChild(slider);
});

if ($scope.psAutoClose) {
$scope.$on('$locationChangeStart', function() {
psClose(slider, param);
});
$scope.$on('$stateChangeStart', function() {
psClose(slider, param);
});

}
}
};
}
]);

})(this);
2 changes: 1 addition & 1 deletion dist/js/eda.dragdropway.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/eda.easyFormViewer.js
View file
@@ -1,6 +1,6 @@
/**
*easyFormViewer
*Version 1.0.29
*Version 1.0.31
*Author : Erwan Datin (MacKentoch)
*Link: https://github.com/MacKentoch/easyFormGenerator
*License : MIT (2015)
Expand Down

0 comments on commit 1ec1857

Please sign in to comment.