new

.gitignore

@@ -1,4 +1,7 @@
 node_modules
 bower_components
 .sass-cache
-compiled
+compiled
+npm-debug.log
+.DS_Store
+.idea

.nvmrc

@@ -0,0 +1 @@
+10.15.3

Gruntfile.coffee

@@ -1,4 +1,4 @@
-ALL_TASKS = ['jst:all', 'coffee:all', 'concat:all', 'stylus:all', 'clean:compiled']
+ALL_TASKS = ['jst:all', 'coffee:all', 'concat:all', 'stylus:all', 'clean:compiled', 'copy:all']
 
 # formbuilder.js must be compiled in this order:
 # 1. rivets-config
@@ -19,8 +19,10 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks('grunt-contrib-uglify')
   grunt.loadNpmTasks('grunt-contrib-watch')
   grunt.loadNpmTasks('grunt-contrib-clean')
+  grunt.loadNpmTasks('grunt-contrib-copy')
   grunt.loadNpmTasks('grunt-release')
   grunt.loadNpmTasks('grunt-karma')
+  grunt.loadNpmTasks('grunt-contrib-connect')
 
   grunt.initConfig
 
@@ -57,27 +59,48 @@ module.exports = (grunt) ->
         files:
           '<%= distFolder %>/formbuilder.js': '<%= compiledFolder %>/*.js'
           '<%= vendorFolder %>/js/vendor.js': [
+            'src/polyfills/ie8-node-enum.js'
             'bower_components/ie8-node-enum/index.js'
-            'bower_components/jquery/jquery.js'
+            'bower_components/jquery/dist/jquery.js'
             'bower_components/jquery-ui/ui/jquery.ui.core.js'
             'bower_components/jquery-ui/ui/jquery.ui.widget.js'
             'bower_components/jquery-ui/ui/jquery.ui.mouse.js'
             'bower_components/jquery-ui/ui/jquery.ui.draggable.js'
             'bower_components/jquery-ui/ui/jquery.ui.droppable.js'
             'bower_components/jquery-ui/ui/jquery.ui.sortable.js'
             'bower_components/jquery.scrollWindowTo/index.js'
-            'bower_components/underscore/underscore-min.js'
+            'bower_components/lodash/dist/lodash.min.js'
             'bower_components/underscore.mixin.deepExtend/index.js'
             'bower_components/rivets/dist/rivets.js'
             'bower_components/backbone/backbone.js'
             'bower_components/backbone-deep-model/src/deep-model.js'
+            'bower_components/bootstrap/dist/js/bootstrap.js',
+            'bower_components/bootstrap/js/tooltip.js',
+            'bower_components/signature_pad/signature_pad.js'
+            'bower_components/node-uuid/uuid.js'
+            'bower_components/spectrum/spectrum.js',
+            'bower_components/select2/select2/dist/js/select2.min.js'
           ]
+          '<%= vendorFolder %>/css/vendor.css': [
+              'bower_components/font-awesome/css/font-awesome.css',
+              'bower_components/bootstrap/dist/css/bootstrap.css',
+              'bower_components/summernote/dist/summernote.css',
+              'bower_components/select2/dist/css/select2.css',
+              'bower_components/spectrum/spectrum.css'
+          ]
+
+    copy:
+        all:
+            expand: true,
+            flatten: true,
+            src: 'bower_components/font-awesome/fonts/*',
+            dest: '<%= vendorFolder %>/fonts/'
 
     cssmin:
       dist:
         files:
           '<%= distFolder %>/formbuilder-min.css': '<%= distFolder %>/formbuilder.css'
-          '<%= vendorFolder %>/css/vendor.css': 'bower_components/font-awesome/css/font-awesome.css'
+
 
     stylus:
       all:
@@ -99,6 +122,12 @@ module.exports = (grunt) ->
         files: ['<%= srcFolder %>/**/*.{coffee,styl,html}']
         tasks: ALL_TASKS
 
+    connect:
+      server:
+        options:
+          port: 9001
+          keepalive: true
+
     # To test, run `grunt --no-write -v release`
     release:
       npm: false

README.md

@@ -8,6 +8,8 @@ Formbuilder is a graphical interface for letting users build their own webforms.
 ## Demo
 [Click here](http://dobtco.github.io/formbuilder/) to see Formbuilder in action.
 
+## Add new icons to element
+If you need to add/replace icon for form element, you can find all available icons from `icon-font-demo` folder
 ## Basic usage
 ```
 <div id='formbuilder'></div>
@@ -38,38 +40,38 @@ Because of its modular nature, Formbuilder is easy to customize. Most of the con
 Keeping with the customizable nature of Formbuilder, you are also able to modify how Formbuilder structures its JSON output. The [default keypaths](https://github.com/dobtco/formbuilder/blob/master/coffee/main.coffee#L20) are:
 
 ```coffeescript
-SIZE: 'field_options.size'
-UNITS: 'field_options.units'
+SIZE: 'options.size'
+UNITS: 'options.units'
 LABEL: 'label'
-FIELD_TYPE: 'field_type'
+type: 'type'
 REQUIRED: 'required'
 ADMIN_ONLY: 'admin_only'
-OPTIONS: 'field_options.options'
-DESCRIPTION: 'field_options.description'
-INCLUDE_OTHER: 'field_options.include_other_option'
-INCLUDE_BLANK: 'field_options.include_blank_option'
-INTEGER_ONLY: 'field_options.integer_only'
-MIN: 'field_options.min'
-MAX: 'field_options.max'
-MINLENGTH: 'field_options.minlength'
-MAXLENGTH: 'field_options.maxlength'
-LENGTH_UNITS: 'field_options.min_max_length_units'
+OPTIONS: 'options.options'
+DESCRIPTION: 'options.description'
+INCLUDE_OTHER: 'options.include_other_option'
+INCLUDE_BLANK: 'options.include_blank_option'
+INTEGER_ONLY: 'options.integer_only'
+MIN: 'options.min'
+MAX: 'options.max'
+MINLENGTH: 'options.minlength'
+MAXLENGTH: 'options.maxlength'
+LENGTH_UNITS: 'options.min_max_length_units'
 ```
 
 Which outputs JSON that looks something like:
 
 ```javascript
 [{
     "label": "Please enter your clearance number",
-    "field_type": "text",
+    "type": "text",
     "required": true,
-    "field_options": {},
+    "options": {},
     "cid": "c6"
 }, {
     "label": "Security personnel #82?",
-    "field_type": "radio",
+    "type": "radio",
     "required": true,
-    "field_options": {
+    "options": {
         "options": [{
             "label": "Yes",
             "checked": false
@@ -82,9 +84,9 @@ Which outputs JSON that looks something like:
     "cid": "c10"
 }, {
     "label": "Medical history",
-    "field_type": "file",
+    "type": "file",
     "required": true,
-    "field_options": {},
+    "options": {},
     "cid": "c14"
 }]
 ```
@@ -108,10 +110,63 @@ Have a question about Formbuilder? Feel free to [open a GitHub Issue](https://gi
 ## Developing
 You'll need [node and npm](http://nodejs.org/) installed.
 
-1. `npm install`
-2. `bower install`
-3. `grunt watch`
-4. open `index.html` and you're all set!
+1. `nvm use`
+2. `npm install`
+3. `bower install`
+4. `grunt watch`
+5. Open  a new terminal and run `grunt connect`
+6. open `http://localhost:9001/` and you're all set!
+
+## Committing your changes and migrating to integral project
+1. Ensure you're running `grunt watch` while developing so that your main formbuilder.js file is up to date
+2. If you have made any changes to the formbuilder css, do the same for it with `grunt cssmin` (for completeness, as above)
+3. Copy the changed formbuilder.js files to integral/html/js/ext ; and formbuilder.css file to integral/html/css
 
 ## License
 MIT
+
+## Currently known issues
+Last time this was worked on there were issues getting a new repo set up.
+* npm install was failing to install correctly:
+    * running into issues with not finding xcode while trying to install gym.
+    * throwing lots of deprecation, no member named 'New' in 'v8::String', and NAN_THROW_ERRORs when installing gym
+
+Note made on the last attempt:
+
+If node install fails with `gyp: No Xcode or CLT version detected!`
+Run `xcode-select --install` and try again.
+If you have a pending or recently updated xcode you may need to open the app and accept permissions.
+
+You may also need to completely delete and re-install xcode with
+~~~
+sudo rm -rf $(xcode-select -print-path)
+xcode-select --install
+~~~
+
+Also, you may not be able to get node install to work because node-gym is unsupported with errors like this:
+~~~
+ CXX(target) Release/obj.target/fse/fsevents.o
+In file included from ../fsevents.cc:6:
+../../nan/nan.h:213:31: warning: 'Uint32Value' is deprecated [-Wdeprecated-declarations]
+      ? optionsObj->Get(opt)->Uint32Value()
+                              ^
+/Users/paul/Library/Caches/node-gyp/10.19.0/include/node/v8.h:2477:3: note: 'Uint32Value' has been
+      explicitly marked deprecated here
+  V8_DEPRECATED("Use maybe version", uint32_t Uint32Value() const);
+~~~
+
+In that case you can switch to a much earlier version of node and try again, though it may not work:
+~~~
+nvm install 0.8
+nvm use 0.8
+nvm ls
+~~~
+
+One last thing - node-gym has lots of issues. Sometimes if will completely stop after throwing all the errors, but sometimes it will continue.
+If all else fails, completely uninstall it globally and nuke your node_modules folder and try again.
+It worked for me last time.
+~~~
+sudo npm uninstall node-gyp -g
+rm -rf node_modules
+npm install
+~~~ 

bower.json

@@ -16,15 +16,20 @@
     "tests"
   ],
   "dependencies": {
-    "ie8-node-enum": "https://gist.github.com/adamjacobbecker/8902451/raw/b68459289526cb76c2e22416d98d0dbd0b722fa0/ie8_node_enum.js",
-    "jquery": "~2.0.3",
+    "jquery.scrollWindowTo": "https://gist.github.com/ajb/6519570/raw/cd741057495d0fb19e545a0f9a098efba3bef9c8/jquery.scrollWindowTo.js",
+    "jquery": "~1.11.1",
     "jquery-ui": "~1.10.3",
-    "jquery.scrollWindowTo": "https://gist.github.com/adamjacobbecker/6519570/raw/cd741057495d0fb19e545a0f9a098efba3bef9c8/jquery.scrollWindowTo.js",
-    "underscore": "~1.5.2",
-    "underscore.mixin.deepExtend": "https://gist.github.com/adamjacobbecker/6519561/raw/63682037af9b10200b05c1a3d5890903397b2103/underscore.mixin.deepExtend.js",
     "backbone": "~1.1.0",
     "backbone-deep-model": "~0.10.4",
+    "underscore.mixin.deepExtend": "https://gist.github.com/ajb/6519561/raw/63682037af9b10200b05c1a3d5890903397b2103/underscore.mixin.deepExtend.js",
     "rivets": "~0.5.13",
-    "font-awesome": "~4.0.0"
+    "signature_pad": "~1.3.2",
+    "bootstrap": "~3.1.1",
+    "summernote": "~0.6.16",
+    "node-uuid": "~1.4.1",
+    "mathjs": "~1.1.1",
+    "lodash": "~2.4.1",
+    "spectrum": "~1.7.1",
+    "select2": "~4.0"
   }
-}
+}