Skip to content

Commit

Permalink
Fix configuration collisions with other idx components.
Browse files Browse the repository at this point in the history
Also fix links to github repo.
  • Loading branch information
Asaf Shakarzy committed Feb 24, 2015
1 parent 6dbce68 commit 4699e19
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import Em from 'ember';
import Config from 'ember-idx-utils/config'
import IdxConfig from 'ember-idx-utils/config'

export default {
name: 'ember-idx-wysiwyg',
initialize: function() {
if (!Em.Config) {
Em.Config = Config = Config.create()
}
var Config = Em.IdxConfig = Em.IdxConfig ? Em.IdxConfig : IdxConfig.create();

var bsConfig = Config.getConfig('bs');
if (!bsConfig) {
Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/navbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
</a>
</li>
<li>
<a href="https://github.com/ember-addons/ember-idx-wysiwyg">
<a href="https://github.com/indexiatech/ember-idx-wysiwyg">
<i class="fa fa-github-alt"></i>
Github
</a>
</li>
</ul>
<form class="navbar-form navbar-right">
<a href="https://github.com/ember-addons/ember-idx-wysiwyg/archive/master.zip" style="font-weight:bold" class="btn btn-success">
<a href="https://github.com/indexiatech/ember-idx-wysiwyg/archive/master.zip" style="font-weight:bold" class="btn btn-success">
<i class="fa fa-save"></i>
Download 1~ kb
</a>
Expand All @@ -35,7 +35,7 @@
<li>
<!-- github -->
<div>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=ember-addons&amp;repo=ember-forms&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=indexiatech&amp;repo=ember-idx-wysiwyg&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
</div>
</li>
</ul>
Expand Down

0 comments on commit 4699e19

Please sign in to comment.