From 9d52258715b9033c9f39e1c6e51a675690aa5f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20Dahlstr=C3=B8m?= Date: Mon, 9 Jan 2017 10:50:27 +0100 Subject: [PATCH 1/4] Turn plugin off MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kenneth Dahlstrøm --- app/assets/js/_component_feedbackform.js | 144 +++++++++++------------ package.json | 2 +- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/app/assets/js/_component_feedbackform.js b/app/assets/js/_component_feedbackform.js index 420dccc..648f9b0 100644 --- a/app/assets/js/_component_feedbackform.js +++ b/app/assets/js/_component_feedbackform.js @@ -1,82 +1,82 @@ (function(Hiof, undefined) { - // Setup client information in the view - Hiof.view.setupClientInformationInOptions(); + // Setup client information in the view + //Hiof.view.setupClientInformationInOptions(); - Hiof.setupFeedbackForm = function(ln) { + Hiof.setupFeedbackForm = function(ln) { - $.getJSON("/assets/js/data/i18n.json", function(data) { - var myData = data[ln]["feedback-form"]; + $.getJSON("/assets/js/data/i18n.json", function(data) { + var myData = data[ln]["feedback-form"]; - var clientOptions = Hiof.options.client; + var clientOptions = Hiof.options.client; - myData.clientLanguage = ln; - myData.clientUrl = clientOptions.url; - myData.clientBrowserName = clientOptions.browserName; - myData.clientBrowserVersion = clientOptions.browserVersion; - myData.clientOsName = clientOptions.osName; - myData.clientOsVersion = clientOptions.osVersion; - myData.clientViewportWidth = clientOptions.viewportWidth; - myData.clientViewportHeight = clientOptions.viewportHeight; + myData.clientLanguage = ln; + myData.clientUrl = clientOptions.url; + myData.clientBrowserName = clientOptions.browserName; + myData.clientBrowserVersion = clientOptions.browserVersion; + myData.clientOsName = clientOptions.osName; + myData.clientOsVersion = clientOptions.osVersion; + myData.clientViewportWidth = clientOptions.viewportWidth; + myData.clientViewportHeight = clientOptions.viewportHeight; - Hiof.appendFeedbackForm(myData); - }); - //return feedbackForm; - }; - Hiof.appendFeedbackForm = function(data) { - let templateSource = Hiof.Templates['forms/feedback'], - markup = templateSource(data); - - $('#main').append(markup); - var formHeight = $('.feedback-form').height(); - $('.feedback').css('height', formHeight + 'px'); - }; - - - $(function() { - var lang; - if ($('#main').attr('data-page-category') === "page") { - - lang = $('html').attr('lang'); - - Hiof.setupFeedbackForm(lang); - - } else if ($('#content').attr('data-page-category') === "page") { - lang = $('html').attr('lang'); - - Hiof.setupFeedbackForm(lang); - } - - - $('body').on('submit', '.feedback-form', function(e) { - e.preventDefault(); - - var formData = $('.feedback-form').serialize(); - $.ajax({ - url: "http://hiof.no/api/v1/feedback/", - type: "POST", - data: formData, - beforeSend: function() { - $('.feedback-form fieldset').attr('disabled', 'disabled'); - }, - success: function(data, textStatus, jqXHR) { - //data - response from server - //debug('success:' + data); - $('.feedback-form').slideToggle(); - $('.feedback-form-success').slideToggle(); - }, - error: function(jqXHR, textStatus, errorThrown) { - $('.feedback-form fieldset').prop('disabled', false); - //data - response from server - //debug('error: ' + jqXHR + textStatus + errorThrown); - //debug(textStatus); - - } - }); - - - }); - + Hiof.appendFeedbackForm(myData); }); + //return feedbackForm; + }; + Hiof.appendFeedbackForm = function(data) { + let templateSource = Hiof.Templates['forms/feedback'], + markup = templateSource(data); + + $('#main').append(markup); + var formHeight = $('.feedback-form').height(); + $('.feedback').css('height', formHeight + 'px'); + }; + + + //$(function() { + // var lang; + // if ($('#main').attr('data-page-category') === "page") { + // + // lang = $('html').attr('lang'); + // + // Hiof.setupFeedbackForm(lang); + // + // } else if ($('#content').attr('data-page-category') === "page") { + // lang = $('html').attr('lang'); + // + // Hiof.setupFeedbackForm(lang); + // } + // + // + // $('body').on('submit', '.feedback-form', function(e) { + // e.preventDefault(); + // + // var formData = $('.feedback-form').serialize(); + // $.ajax({ + // url: "http://hiof.no/api/v1/feedback/", + // type: "POST", + // data: formData, + // beforeSend: function() { + // $('.feedback-form fieldset').attr('disabled', 'disabled'); + // }, + // success: function(data, textStatus, jqXHR) { + // //data - response from server + // //debug('success:' + data); + // $('.feedback-form').slideToggle(); + // $('.feedback-form-success').slideToggle(); + // }, + // error: function(jqXHR, textStatus, errorThrown) { + // $('.feedback-form fieldset').prop('disabled', false); + // //data - response from server + // //debug('error: ' + jqXHR + textStatus + errorThrown); + // //debug(textStatus); + // + // } + // }); + // + // + // }); + // + //}); })(window.Hiof = window.Hiof || {}); diff --git a/package.json b/package.json index 92a3b17..1866577 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "feedback-form", - "version": "1.1.1", + "version": "1.1.2", "author": "HiØ, Kenneth Lindbeck-Dahlstrøm ", "repository": { "type": "git", From abb5976ed2a320cf4af6c0a3e86f5d71dee06fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20Dahlstr=C3=B8m?= Date: Mon, 9 Jan 2017 11:06:14 +0100 Subject: [PATCH 2/4] Changed to the new variable partials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kenneth Dahlstrøm --- app/assets/sass/feedback-form.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/sass/feedback-form.scss b/app/assets/sass/feedback-form.scss index f85ef75..159e141 100644 --- a/app/assets/sass/feedback-form.scss +++ b/app/assets/sass/feedback-form.scss @@ -1,7 +1,9 @@ // Imports @import '../../../vendor/sass-mq/mq'; -@import '../../../vendor/frontend/app/assets/sass/variables/_standard.scss'; - +@import "../../../vendor/frontend/app/assets/sass/variables/_border-radius"; +@import "../../../vendor/frontend/app/assets/sass/variables/_whitespace"; +@import "../../../vendor/frontend/app/assets/sass/variables/_divider"; +@import "../../../vendor/frontend/app/assets/sass/variables/_breakpoints"; // ----------------------------------------------------------- // ----------------------------------------------------------- From a84ac8e87a69feeb48fc3b72920a65621026f5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20Dahlstr=C3=B8m?= Date: Mon, 9 Jan 2017 11:06:41 +0100 Subject: [PATCH 3/4] Updated dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kenneth Dahlstrøm --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1866577..187cc7a 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "grunt-contrib-watch": "^1.0.0", "grunt-eslint": "^19.0.0", "grunt-sass": "^2.0.0", - "grunt-ssh": "^0.11.1", + "grunt-ssh": "^0.12.9", "grunt-static-versioning": "^0.2.1", "matchdep": "*", "moment": "^2.17.1", @@ -36,7 +36,7 @@ "time-grunt": "^1.4.0" }, "dependencies": { - "bower": "1.3.9" + "bower": "^1.8.0" }, "license": "GPL-3.0" } From 3bc0846a8cc458e111bc7342960d95f6df0a18a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20Dahlstr=C3=B8m?= Date: Mon, 9 Jan 2017 11:08:06 +0100 Subject: [PATCH 4/4] Remove template from generated plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kenneth Dahlstrøm --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6f5f8c3..39f062e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -101,8 +101,8 @@ module.exports = function(grunt) { concat: { scripts: { src: [ - 'vendor/jQuery-ajaxTransport-XDomainRequest/jquery.xdomainrequest.min.js', - 'build/templates.js', + //'vendor/jQuery-ajaxTransport-XDomainRequest/jquery.xdomainrequest.min.js', + //'build/templates.js', 'build/_<%= pkg.name %>.js' ], dest: 'build/<%= pkg.name %>.v<%= pkg.version %>.js'