This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit de3b686a11dd302e287e4e03596aed8517dc8dc0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 9 13:59:40 2014 +0200 delete attributs in scope.choice --- pollen-ui-angular/src/main/webapp/index.html | 6 +++--- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 +------ pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html | 5 ++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 7f154b2..289e79f 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -31,9 +31,9 @@ ou $ mvn compile --> - <link rel="stylesheet/less" type="text/css" href="less/style.less" /> - <script language="javascript" type="text/javascript" src="lib/less/dist/less-1.7.3.min.js"></script> - <!--<link rel="stylesheet" type="text/css" href="css/style.css"/>--> + <!--<link rel="stylesheet/less" type="text/css" href="less/style.less" />--> + <!--<script language="javascript" type="text/javascript" src="lib/less/dist/less-1.7.3.min.js"></script>--> + <link rel="stylesheet" type="text/css" href="css/style.css"/> <script language="javascript" type="text/javascript" src="js/conf.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 9bb3187..d038e2c 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -205,7 +205,6 @@ angular.module('pollControllers', []) choice.value = choice.value.getTime(); } else if (choice.choiceType == 'IMAGE') { - choice.value = choice.value.meta.name+"####"+choice.value.data; } @@ -367,8 +366,7 @@ angular.module('pollControllers', []) var initChoice = function () { return { choiceType : $scope.globalVariables.lastType, - valueText : '', - valueDate : $scope.globalVariables.lastDate, + value : '' }; } @@ -441,9 +439,6 @@ angular.module('pollControllers', []) else if (choice.choiceType == 'IMAGE') { choice.value = choice.valueImage; } - delete choice.valueText; - delete choice.valueDate; - delete choice.valueImage if (!angular.equals(choiceEdit, choice)) { choiceEdit.value = choice.value; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index bb2bf39..a8a06f0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -55,11 +55,10 @@ </div> <div class="form-group" ng-if="choice.choiceType == 'IMAGE'"> - <label for="popChoiceImage" class="col-sm-4 control-label">Image : </label> + <label class="col-sm-4 control-label">Image : </label> <div class="col-sm-6"> - <upload-file id="popChoiceImage" ng-model="choice.valueImage" focus-me="choice.choiceType == 'IMAGE'" ></upload-file> - {{choice.valueImage.meta.name}} + <upload-file ng-model="choice.valueImage"></upload-file> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.