Fix multi dynamicforms behaviour

This commit is contained in:
RyuAhyoung 2017-03-19 00:07:27 +09:00
parent 00e6aed0c7
commit 266f0c81d6
2 changed files with 8 additions and 8 deletions

View file

@ -90,8 +90,7 @@ limitations under the License.
</li>
<li role="separator" class="divider"></li>
<li style="padding-top:8px"
ng-if="paragraph.settings.forms[$root.keys(paragraph.settings.forms)].options &&
paragraph.settings.forms[$root.keys(paragraph.settings.forms)].type != 'checkbox'">
ng-if="paragraph.config.runOnSelectionChange == true || paragraph.config.runOnSelectionChange == false">
<span ng-if="paragraph.config.runOnSelectionChange == true" class="fa fa-toggle-on shortcut-icon" style="padding:3px 8px 8px 20px"></span>
<span ng-if="paragraph.config.runOnSelectionChange == false" class="fa fa-toggle-off shortcut-icon" style="padding:3px 8px 8px 20px"></span>Run on selection change
<form style="display:inline; float:right">

View file

@ -137,11 +137,13 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
if (config.enabled === undefined) {
config.enabled = true;
}
if (forms[Object.keys(forms)]) {
if (forms[Object.keys(forms)].options && forms[Object.keys(forms)].type !== 'checkbox') {
if (config.runOnSelectionChange === undefined) {
config.runOnSelectionChange = true;
for (var idx in forms) {
if (forms[idx]) {
if (forms[idx].options && forms[idx].type !== 'checkbox') {
if (config.runOnSelectionChange === undefined) {
config.runOnSelectionChange = true;
}
}
}
}
@ -362,7 +364,6 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
if (!paragraphText || $scope.isRunning($scope.paragraph)) {
return;
}
const magic = SpellResult.extractMagic(paragraphText);
if (heliumService.getSpellByMagic(magic)) {