From df49b433f3f9c557788e5aeb82fc1677067a0110 Mon Sep 17 00:00:00 2001 From: Jeffrey Sullivan Date: Mon, 1 Sep 2014 12:17:15 -0500 Subject: [PATCH 1/4] Fixes #89. Watcher on the Edit JSON button pulls the current value of formData back into formDataStr for editing. --- demo/views/home.js | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/demo/views/home.js b/demo/views/home.js index 372def53..8f312486 100644 --- a/demo/views/home.js +++ b/demo/views/home.js @@ -50,16 +50,26 @@ app.controller('home', function($scope, $parse, $window, usingCustomTypeTemplate $scope.formFieldsError = true; } }); - $scope.$watch('formDataStr', function onDataUpdated(newValue) { - try { - $scope.formData = $parse(newValue)({}); - $scope.formDataError = false; - } catch (e) { - $scope.formDataError = true; - } - }); + $scope.$watch('formDataStr', function onDataUpdated(newValue) { + try { + $scope.formData = $parse(newValue)({}); + $scope.formDataError = false; + } catch (e) { + $scope.formDataError = true; + } + }); + + $scope.$watch('editJSON', function onDataObjectUpdated(newValue) { + try { + if(newValue == true) { + $scope.formDataStr = $scope.toPrettyJSON($scope.formData, 4); + } + } catch (e) { + $scope.formDataError = true; + } + }); - // Public Vars + // Public Vars if (usingCustomTypeTemplates) { $scope.typeTemplatesButton = 'Use Built-in Type Templates'; } else { From 2c9a94b451991efa1dd0630668d12caf967aecc6 Mon Sep 17 00:00:00 2001 From: Jeffrey Sullivan Date: Mon, 1 Sep 2014 19:13:56 -0500 Subject: [PATCH 2/4] Fixes #89. Watcher on the Edit JSON button pulls the current value of formData back into formDataStr for editing. Reformatted spacing for TABs. --- demo/views/home.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/demo/views/home.js b/demo/views/home.js index 8f312486..ae3f6aac 100644 --- a/demo/views/home.js +++ b/demo/views/home.js @@ -51,23 +51,23 @@ app.controller('home', function($scope, $parse, $window, usingCustomTypeTemplate } }); $scope.$watch('formDataStr', function onDataUpdated(newValue) { - try { - $scope.formData = $parse(newValue)({}); - $scope.formDataError = false; - } catch (e) { - $scope.formDataError = true; - } - }); + try { + $scope.formData = $parse(newValue)({}); + $scope.formDataError = false; + } catch (e) { + $scope.formDataError = true; + } + }); - $scope.$watch('editJSON', function onDataObjectUpdated(newValue) { - try { - if(newValue == true) { - $scope.formDataStr = $scope.toPrettyJSON($scope.formData, 4); - } - } catch (e) { - $scope.formDataError = true; - } - }); + $scope.$watch('editJSON', function onDataObjectUpdated(newValue) { + try { + if(newValue == true) { + $scope.formDataStr = $scope.toPrettyJSON($scope.formData, 4); + } + } catch (e) { + $scope.formDataError = true; + } + }); // Public Vars if (usingCustomTypeTemplates) { From 0d2fd38693130d777cf0bc235ac6ef5e53d2b4e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Sullivan Date: Wed, 3 Sep 2014 17:14:25 -0500 Subject: [PATCH 3/4] Test checkin --- demo/app.js | 3 +- demo/main.css | 2 +- demo/views/custom-field-buttongroup.html | 19 +++++++ demo/views/home.js | 64 ++++++++++++++++++++---- dist/formly.bootstrap.min.map | 2 +- 5 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 demo/views/custom-field-buttongroup.html diff --git a/demo/app.js b/demo/app.js index 727c819c..b3cc933d 100644 --- a/demo/app.js +++ b/demo/app.js @@ -26,7 +26,8 @@ app.config(function($stateProvider, $urlRouterProvider, $locationProvider, forml // or formlyConfigProvider.setTemplateUrl({ radio: 'views/custom-field-radio.html', - checkbox: 'views/custom-field-checkbox.html' + checkbox: 'views/custom-field-checkbox.html', + buttongroup: 'views/custom-field-buttongroup.html' }); } diff --git a/demo/main.css b/demo/main.css index f6df11ce..402407d6 100644 --- a/demo/main.css +++ b/demo/main.css @@ -9,4 +9,4 @@ .footer { text-align: center; padding: 25px; -} \ No newline at end of file +} diff --git a/demo/views/custom-field-buttongroup.html b/demo/views/custom-field-buttongroup.html new file mode 100644 index 00000000..6aadadb3 --- /dev/null +++ b/demo/views/custom-field-buttongroup.html @@ -0,0 +1,19 @@ +
+ Custom field of type "buttongroup" + +
+ +
\ No newline at end of file diff --git a/demo/views/home.js b/demo/views/home.js index ae3f6aac..b1b74edd 100644 --- a/demo/views/home.js +++ b/demo/views/home.js @@ -59,15 +59,7 @@ app.controller('home', function($scope, $parse, $window, usingCustomTypeTemplate } }); - $scope.$watch('editJSON', function onDataObjectUpdated(newValue) { - try { - if(newValue == true) { - $scope.formDataStr = $scope.toPrettyJSON($scope.formData, 4); - } - } catch (e) { - $scope.formDataError = true; - } - }); + // Public Vars if (usingCustomTypeTemplates) { @@ -120,7 +112,59 @@ app.controller('home', function($scope, $parse, $window, usingCustomTypeTemplate value: 'no' } ] - }, { + }, { + "key": "multiSelectButtons", + "type": "buttongroup", + "selectType": "multiple", + "valueDelimiter": "|", + "label": "Is this thing on?", + "options": [ + { + "name": "Sure", + "value": "sure" + }, + { + "name": "Nope", + "value": "nope" + }, + { + "name": "Why Not?", + "value": "whynot" + } + ] + }, { + "key": "singleToggle", + "type": "buttongroup", + "selectType": "multiple", + "valueDelimiter": "|", + "label": "Toggle me!", + "options": [ + { + "name": "toggle", + "value": "active" + } + ] + }, { + "key": "singleSelectButtons", + "type": "buttongroup", + "selectType": "single", + "required": true, + "label": "Which one is best?", + "options": [ + { + "name": "Apple", + "value": "apple" + }, + { + "name": "Banana", + "value": "banana" + }, + { + "name": "Peach", + "value": "peach" + } + ] + }, { key: 'angularFan', type: 'text', label: 'Angular Fan?', diff --git a/dist/formly.bootstrap.min.map b/dist/formly.bootstrap.min.map index cee74bb9..b00e825e 100644 --- a/dist/formly.bootstrap.min.map +++ b/dist/formly.bootstrap.min.map @@ -1 +1 @@ -{"version":3,"file":"formly.bootstrap.min.js","sources":["formly.bootstrap.js"],"names":["angular","module","provider","setTemplateUrl","name","templateUrl","templateUrlMap","forEach","getTemplateUrl","type","setTemplate","template","templateMap","getTemplate","this","$get","directive","$parse","require","link","scope","el","attrs","ctrl","applyValidity","validator","value","validate","isValid","isFunction","validationScope","options","result","$setValidity","validators","$eval","formlyCustomValidation","isArray","$parsers","unshift","viewValue","restrict","priority","controller","$scope","$element","$attrs","removeAttr","$set","formlyDynamicName","$emit","$http","$compile","$templateCache","formlyConfig","transclude","optionsData","formId","index","setElementTemplate","templateData","html","contents","get","cache","then","response","data","error","console","warn","id","replace","fields","formOnParentScope","compile","post","ele","attr","field","isDefined","watch","expression","listener","watchExpression","args","Array","prototype","slice","call","arguments","apply","$watch","hideExpression","hide","requiredExpression","required","$on","e","stopPropagation","window","setTimeout","formField","key","run","put","config","formlyConfigProvider"],"mappings":"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"} \ No newline at end of file +{"version": 3, "file": "formly.bootstrap.min.js", "sources": ["formly.bootstrap.js"], "names": ["angular", "module", "provider", "setTemplateUrl", "name", "templateUrl", "templateUrlMap", "forEach", "getTemplateUrl", "type", "setTemplate", "template", "templateMap", "getTemplate", "this", "$get", "directive", "$parse", "require", "link", "scope", "el", "attrs", "ctrl", "applyValidity", "validator", "value", "validate", "isValid", "isFunction", "validationScope", "options", "result", "$setValidity", "validators", "$eval", "formlyCustomValidation", "isArray", "$parsers", "unshift", "viewValue", "restrict", "priority", "controller", "$scope", "$element", "$attrs", "removeAttr", "$set", "formlyDynamicName", "$emit", "$http", "$compile", "$templateCache", "formlyConfig", "transclude", "optionsData", "formId", "index", "setElementTemplate", "templateData", "html", "contents", "get", "cache", "then", "response", "data", "error", "console", "warn", "id", "replace", "fields", "formOnParentScope", "compile", "post", "ele", "attr", "field", "isDefined", "watch", "expression", "listener", "watchExpression", "args", "Array", "prototype", "slice", "call", "arguments", "apply", "$watch", "hideExpression", "hide", "requiredExpression", "required", "$on", "e", "stopPropagation", "window", "setTimeout", "formField", "key", "run", "put", "config", "formlyConfigProvider"], "mappings": "AACAA,QAAQC,OAAO,oBAEfD,QAAQC,OAAO,UAAW,kBAC1BD,QAAQC,OAAO,iBACdC,SAAS,eAAgB,WACzB,YAKA,SAASC,GAAeC,EAAMC,GACT,gBAATD,GACVE,EAAeF,GAAQC,EAEvBL,QAAQO,QAAQH,EAAM,SAASC,EAAaD,GAC3CD,EAAeC,EAAMC,KAKxB,QAASG,GAAeC,GACvB,MAAOH,GAAeG,GAGvB,QAASC,GAAYN,EAAMO,GACN,gBAATP,GACVQ,EAAYR,GAAQO,EAEpBX,QAAQO,QAAQH,EAAM,SAASO,EAAUP,GACxCM,EAAYN,EAAMO,KAKrB,QAASE,GAAYJ,GACpB,MAAOG,GAAYH,GA5BpB,GAAIH,MACAM,IA8BJE,MAAKN,eAAiBA,EACtBM,KAAKX,eAAiBA,EAEtBW,KAAKD,YAAcA,EACnBC,KAAKJ,YAAcA,EAEnBI,KAAKC,KAAO,WACX,MAAOD,SAITd,QAAQC,OAAO,iBAAiBe,UAAU,0BAA2B,SAAU,SAASC,GACvF,YAEA,QACCC,QAAS,UACTC,KAAM,SAASC,EAAOC,EAAIC,EAAOC,GAiBhC,QAASC,GAAcC,EAAWC,GACjC,GAAKD,EAAUE,SAAf,CAGA,GAAIC,IAAU,CACd,IAAI5B,QAAQ6B,WAAWJ,EAAUE,UAChCC,EAAUH,EAAUE,SAASD,EAAON,OAC9B,CACN,GAAIU,IACHJ,MAAOA,EACPK,QAASX,EAAMW,QACfC,OAAQZ,EAAMY,OAEfJ,GAAUX,EAAOQ,EAAUE,UAAUG,GAEtCP,EAAKU,aAAaR,EAAUrB,KAAMwB,IA/BnC,GAAIM,GAAad,EAAMe,MAAMb,EAAMc,uBAC9BF,KAGAlC,QAAQqC,QAAQH,KACpBA,GAAcA,IAIflC,QAAQO,QAAQ2B,EAAY,SAAST,GACpCF,EAAKe,SAASC,QAAQ,SAASC,GAE9B,MADAhB,GAAcC,EAAWe,GAClBA,YAwBZxC,QAAQC,OAAO,iBAAiBe,UAAU,oBAAqB,WAC9D,YACA,QACCyB,SAAU,IACVC,SAAU,IACVC,YAAa,SAAU,WAAY,SAAU,SAASC,EAAQC,EAAUC,GACvED,EAASE,WAAW,uBACpBD,EAAOE,KAAK,OAAQJ,EAAOT,MAAMW,EAAOG,0BACjCH,GAAOG,kBACdL,EAAOM,MAAM,mCAIhBlD,QAAQC,OAAO,iBACde,UAAU,eAAgB,QAAS,WAAY,iBAAkB,eAAgB,SAAqBmC,EAAOC,EAAUC,EAAgBC,GACvI,YACA,QACCb,SAAU,KACVc,YAAY,EACZnC,OACCoC,YAAa,WACbC,OAAQ,UACRC,MAAO,SACP1B,OAAQ,eAETb,KAAM,SAAmByB,EAAQC,GAkBhC,QAASc,GAAmBC,GAC3Bf,EAASgB,KAAKD,GACdR,EAASP,EAASiB,YAAYlB,GAnB/B,GAAIjC,GAAWiC,EAAOb,QAAQpB,UAAY2C,EAAazC,YAAY+B,EAAOb,QAAQtB,KAClF,IAAIE,EACHgD,EAAmBhD,OACb,CACN,GAAIN,GAAcuC,EAAOb,QAAQ1B,aAAeiD,EAAa9C,eAAeoC,EAAOb,QAAQtB,KACvFJ,GACH8C,EAAMY,IAAI1D,GACT2D,MAAOX,IACLY,KAAK,SAASC,GAChBP,EAAmBO,EAASC,OAC1B,SAASC,GACXC,QAAQC,KAAK,8CAAgDjE,EAAa+D,KAG3EC,QAAQC,KAAK,gCAAmC1B,EAAOb,QAAQtB,KAAO,sBAQzEkC,YAAa,SAAU,SAAyBC,GAC/CA,EAAOb,QAAUa,EAAOY,aACxB,IAAI/C,GAAOmC,EAAOb,QAAQtB,MACrBA,GAAQmC,EAAOb,QAAQpB,SAC3BF,EAAO,YACIA,GAAQmC,EAAOb,QAAQ1B,cAClCI,EAAO,eAIRmC,EAAO2B,GAAK3B,EAAOa,OAAShD,EAAOmC,EAAOc,YAK7C1D,QAAQC,OAAO,iBACde,UAAU,aAAc,WACxB,YACA,QACCyB,SAAU,IACVpC,YAAa,8BACbmE,SAAS,EACTjB,YAAY,EACZnC,OACCqD,OAAQ,IACR1C,QAAS,KACTC,OAAQ,IACR0C,kBAAmB,SAEpBC,QAAS,WACR,OACCC,KAAM,SAAUxD,EAAOyD,EAAKC,GAG3B1D,EAAMsD,kBAAoBtD,EAAM0D,EAAK1E,SAIxCuC,YAAa,SAAU,WAAY,SAAU,SAASC,EAAQC,EAAU5B,GAEvEjB,QAAQO,QAAQqC,EAAO6B,OAAQ,SAASM,GACvC,GAAI/E,QAAQgF,UAAUD,EAAME,QAC3BjF,QAAQgF,UAAUD,EAAME,MAAMC,aAC9BlF,QAAQgF,UAAUD,EAAME,MAAME,UAAW,CACzC,GAAIC,GAAkBL,EAAME,MAAMC,UAC9BlF,SAAQ6B,WAAWuD,KAEtBA,EAAkB,WACjB,GAAIC,GAAOC,MAAMC,UAAUC,MAAMC,KAAKC,UAAW,EAEjD,OADAL,GAAK9C,QAAQwC,GACNA,EAAME,MAAMC,WAAWS,MAAM7E,KAAMuE,KAI5CzC,EAAOgD,OAAOR,EAAiB,WAE9B,GAAIC,GAAOC,MAAMC,UAAUC,MAAMC,KAAKC,UAAW,EAEjD,OADAL,GAAK9C,QAAQwC,GACNA,EAAME,MAAME,SAASQ,MAAM7E,KAAMuE,QAI3CzC,EAAOgD,OAAO,SAAU,WACvB5F,QAAQO,QAAQqC,EAAO6B,OAAQ,SAASM,GACnCA,EAAMc,iBACTd,EAAMe,KAAO7E,EAAO8D,EAAMc,gBAAgBjD,EAAOZ,SAE9C+C,EAAMgB,qBACThB,EAAMiB,SAAW/E,EAAO8D,EAAMgB,oBAAoBnD,EAAOZ,aAGzD,GAEHY,EAAOqD,IAAI,6BAA8B,SAASC,GACjDA,EAAEC,kBACFC,OAAOC,WAAW,WACjBrG,QAAQO,QAAQqC,EAAO6B,OAAQ,SAASM,GACvC,GAAIuB,GAAY1D,EAAO8B,kBAAkBK,EAAMwB,IAC3CD,KACHvB,EAAMuB,UAAYA,cASzBtG,QAAQC,OAAO,iBAAiBuG,KAAK,iBAAkB,SAASnD,GAC9D,YAEAA,GAAeoD,IAAI,oCACjB,sfAIFpD,EAAeoD,IAAI,iCACjB,mjBAIFpD,EAAeoD,IAAI,kCACjB,+DAIFpD,EAAeoD,IAAI,kCACjB,mqBAIFpD,EAAeoD,IAAI,oCACjB,qkBAIFpD,EAAeoD,IAAI,iCACjB,ioBAIFpD,EAAeoD,IAAI,kCACjB,8mBAIFpD,EAAeoD,IAAI,gCACjB,ijBAIFpD,EAAeoD,IAAI,oCACjB,4lBAKJzG,QAAQC,OAAO,iBAAiBuG,KAAK,iBAAkB,SAASnD,GAC9D,YAEAA,GAAeoD,IAAI,8BACjB,0NAIJzG,QAAQC,OAAO,iBAAiBuG,KAAK,iBAAkB,SAASnD,GAC9D,YAEAA,GAAeoD,IAAI,oCACjB,sfAIFpD,EAAeoD,IAAI,iCACjB,mjBAIFpD,EAAeoD,IAAI,kCACjB,+DAIFpD,EAAeoD,IAAI,kCACjB,mqBAIFpD,EAAeoD,IAAI,oCACjB,qkBAIFpD,EAAeoD,IAAI,iCACjB,ioBAIFpD,EAAeoD,IAAI,kCACjB,8mBAIFpD,EAAeoD,IAAI,gCACjB,ijBAIFpD,EAAeoD,IAAI,oCACjB,4lBAKJzG,QAAQC,OAAO,iBAAiBuG,KAAK,iBAAkB,SAASnD,GAC9D,YAEAA,GAAeoD,IAAI,8BACjB,0NAOJzG,QAAQC,OAAO,iBAAiByG,QAAQ,uBAAwB,SAASC,GACxE,YACA,IAAIlC,IACH,WAAY,QAAS,SAAU,SAAU,WACzC,WAAY,SAAU,QAAS,OAEhCzE,SAAQO,QAAQkE,EAAQ,SAASM,GAChC4B,EAAqBxG,eAAe4E,EAAO,uBAAyBA,EAAQ"} \ No newline at end of file From 2535382e5c39acf25e1f948dfa1eddbce4d51f11 Mon Sep 17 00:00:00 2001 From: Jeffrey Sullivan Date: Wed, 3 Sep 2014 17:20:36 -0500 Subject: [PATCH 4/4] Fix edit ability of formData. --- demo/views/home.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/demo/views/home.js b/demo/views/home.js index b1b74edd..43c25c2c 100644 --- a/demo/views/home.js +++ b/demo/views/home.js @@ -59,9 +59,17 @@ app.controller('home', function($scope, $parse, $window, usingCustomTypeTemplate } }); + $scope.$watch('editJSON', function onDataObjectUpdated(newValue) { + try { + if(newValue == true) { + $scope.formDataStr = $scope.toPrettyJSON($scope.formData, 4); + } + } catch (e) { + $scope.formDataError = true; + } + }); - - // Public Vars + // Public Vars if (usingCustomTypeTemplates) { $scope.typeTemplatesButton = 'Use Built-in Type Templates'; } else {