Skip to content
This repository has been archived by the owner on Feb 17, 2020. It is now read-only.

Commit

Permalink
- Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
akadlec committed Jan 2, 2017
1 parent 65a5116 commit 3fe6631
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions client-side/js/ipub.formSlug.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
this.$element = $element;

this.name = this.$element.prop('id');
this.options = $.extend($.fn.ipubFormsSlug.defaults, options, this.$element.data('settings') || {});
this.options = $.extend({}, $.fn.ipubFormsSlug.defaults, options, this.$element.data('settings') || {});
};

IPub.Forms.Slug.prototype =
Expand Down Expand Up @@ -315,4 +315,4 @@

return IPub;

})(jQuery, window, document, location, navigator);
})(jQuery, window, document, location, navigator);
Empty file added docs/en/index.md
Empty file.
4 changes: 2 additions & 2 deletions license.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ remains intact.
New BSD License
---------------

Copyright (c) 2014 Adam Kadlec
Copyright (c) 2015 Adam Kadlec
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down Expand Up @@ -52,4 +52,4 @@ GPL licenses are very very long, so instead of including them here we offer
you URLs with full text:

- [GPL version 2](http://www.gnu.org/licenses/gpl-2.0.html)
- [GPL version 3](http://www.gnu.org/licenses/gpl-3.0.html)
- [GPL version 3](http://www.gnu.org/licenses/gpl-3.0.html)
4 changes: 2 additions & 2 deletions src/IPub/FormSlug/Controls/Slug.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function getControl()
$this->template->value = $this->getValue();
$this->template->caption = $this->caption;
$this->template->_form = $this->getForm();
// Control js settings
// Component js settings
$this->template->settings = [
'toggle' => $this->toggleBox,
'onetime' => $this->onetimeAutoUpdate,
Expand Down Expand Up @@ -215,4 +215,4 @@ public static function register($method = 'addSlug')
}
);
}
}
}

0 comments on commit 3fe6631

Please sign in to comment.