Skip to content

Rework attachment field view so that it triggers events #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielbachhuber merged 13 commits into from
Jul 6, 2015
Merged

Rework attachment field view so that it triggers events #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eae6346
Rework attachment attribute field to extend editAttributeField
goldenapples Jun 9, 2015
aa09b57
Allow custom fields to trigger callback.
goldenapples Jun 10, 2015
84b0ef4
Remove duplicate toggleClass call.
goldenapples Jun 10, 2015
82fe715
Un-browserify the attachment field view
goldenapples Jun 10, 2015
2c2d894
Merge branch 'master' into 316-update-events-attachment-field
goldenapples Jun 25, 2015
300e118
Move editAttributeField into main browserified bundle
goldenapples Jun 29, 2015
c23e329
Wait to load attachment before triggering update event
goldenapples Jun 29, 2015
0aab437
No longer build attachment field separately
goldenapples Jun 29, 2015
57ae7bf
var self was this, not that
goldenapples Jun 29, 2015
d631032
Use a class method for attachment cache object
goldenapples Jun 29, 2015
855d9a8
Add some sugar functions for working with callbacks
goldenapples Jul 1, 2015
714f1a4
Setting every value to "value" isn't a good idea
goldenapples Jul 1, 2015
5018f3b
getValue wasn't designed to be used with other attributes
goldenapples Jul 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ module.exports = function( grunt ) {
dist: {
files : {
'js/build/shortcode-ui.js' : ['js/src/shortcode-ui.js'],
'js/build/field-attachment.js' : ['js/src/field-attachment.js'],
'js/build/field-color.js' : ['js/src/field-color.js'],
'js/build/field-post-select.js' : ['js/src/field-post-select.js'],
},
Expand Down
6 changes: 1 addition & 5 deletions inc/fields/class-field-attachment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ public function filter_shortcode_ui_fields( $fields ) {

public function action_enqueue_shortcode_ui() {

$script = plugins_url( 'js/build/field-attachment.js', dirname( dirname( __FILE__ ) ) );

wp_enqueue_script( 'shortcake-field-attachment', $script, array( 'shortcode-ui' ) );

wp_localize_script( 'shortcake-field-attachment', 'ShortcakeImageFieldData', array(
wp_localize_script( 'shortcode-ui', 'ShortcakeImageFieldData', array(
'defaultArgs' => array(
'libraryType' => null, // array of mime types. eg image, image/jpg, application, application/pdf.
'addButton' => __( 'Select Attachment', 'shortcode-ui' ),
Expand Down
6 changes: 3 additions & 3 deletions js-tests/build/specs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ var ShortcodeAttributes = Backbone.Collection.extend({
return new this.constructor(_.map(this.models, function(m) {
return m.clone();
}));
}
},

});

module.exports = ShortcodeAttributes;
Expand Down Expand Up @@ -477,8 +478,7 @@ Shortcode = Backbone.Model.extend({

return template;

}

},
});

module.exports = Shortcode;
Expand Down
Loading