This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+ //Force audio that isn't mp3s to video because the flash.media.Sound only handles mp3s | |
+ if (!_isVideo && _mediaUrl.indexOf("mp3") == -1) | |
+ _isVideo = true; | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/flash/htmlelements/VideoElement.as b/src/flash/htmlelements/VideoElement.as | |
index 700ecdf..e1d460a 100644 | |
--- a/src/flash/htmlelements/VideoElement.as | |
+++ b/src/flash/htmlelements/VideoElement.as | |
@@ -202,6 +202,14 @@ package htmlelements | |
sendEvent(HtmlMediaEvent.SEEKED); | |
break; | |
+ case "NetStream.Seek.Complete": | |
+ if (_isPreloading) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class RolesController < ApplicationController | |
include Hydra::RoleManagement::RolesBehavior | |
prepend_before_filter :accept_batches, only: [:destroy] | |
def destroy | |
@roles.each {|role| role.destroy} | |
redirect_to roles_path, notice: "Successfully deleted groups: #{params[:ids].join(", ")}" | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require 'spec_helper' | |
describe "UniquenessValidator" do | |
before(:all) do | |
@solr_field = "title_t" | |
@validator = UniquenessValidator.new({:attributes => {}, :solr_name => @solr_field}) | |
@record = stub(pid:"avalon:2") | |
@record.stub("errors").and_return([]) | |
@record.errors.stub('[]').and_return({}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[cjcolvar@localhost avalon]$ rspec spec | |
/home/cjcolvar/.rvm/gems/ruby-1.9.3-p194@avalon/gems/activesupport-3.2.13/lib/active_support/dependencies.rb:251:in `block in require': iconv will be deprecated in the future, use String#encode instead. | |
F.FF.FFF.FFFFFFFFFFFF*F.FFF.FF***F..F..FFFFF.FFF/home/cjcolvar/Code/avalon/avalon/spec/lib/avalon/batch_ingest_spec.rb:26: warning: already initialized constant DropboxService | |
F/home/cjcolvar/Code/avalon/avalon/spec/lib/avalon/batch_ingest_spec.rb:26: warning: already initialized constant DropboxService | |
F/home/cjcolvar/Code/avalon/avalon/spec/lib/avalon/batch_ingest_spec.rb:26: warning: already initialized constant DropboxService | |
*/home/cjcolvar/Code/avalon/avalon/spec/lib/avalon/batch_ingest_spec.rb:26: warning: already initialized constant DropboxService | |
*/home/cjcolvar/Code/avalon/avalon/spec/lib/avalon/batch_ingest_spec.rb:26: warning: already initialized constant DropboxService | |
*......FFF..F...F...........F....**.**F**............*............*........*.....*...*... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
def self.delegate(*methods) | |
options = methods.last | |
if options.include?(:at) || options.include?(:unique) | |
super | |
else | |
Module.delegate(*methods) | |
end | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[cjcolvar@localhost avalon]$ rspec spec/controllers/catalog_controller_spec.rb | |
Run options: exclude {:scaffold=>true} | |
..FF..FF | |
Failures: | |
1) CatalogController#index as an un-authenticated user should not show results for items that are not published | |
Failure/Error: assigns(:document_list).count.should eql(0) | |
expected: 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Failures: | |
1) CatalogController#index as an un-authenticated user should show results for items that are public and published | |
Failure/Error: assigns(:document_list).count.should eql(1) | |
expected: 1 | |
got: 0 | |
(compared using eql?) | |
# ./spec/controllers/catalog_controller_spec.rb:11:in `block (4 levels) in <top (required)>' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/flash/htmlelements/VideoElement.as b/src/flash/htmlelements/VideoElement.as | |
index 700ecdf..e1d460a 100644 | |
--- a/src/flash/htmlelements/VideoElement.as | |
+++ b/src/flash/htmlelements/VideoElement.as | |
@@ -202,6 +202,14 @@ package htmlelements | |
sendEvent(HtmlMediaEvent.SEEKED); | |
break; | |
+ case "NetStream.Seek.Complete": | |
+ if (_isPreloading) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/active_fedora/delegating.rb b/lib/active_fedora/delegating.rb | |
index d2a3a29..d805514 100644 | |
--- a/lib/active_fedora/delegating.rb | |
+++ b/lib/active_fedora/delegating.rb | |
@@ -72,6 +72,7 @@ module ActiveFedora | |
if ds_specs.has_key? to.to_s | |
create_delegate_reader(fields.first, options) | |
create_delegate_setter(fields.first, options) | |
+ create_delegate_changed?(fields.first, options) | |
else |