Skip to content

Commit

Permalink
Changed modules and vendor to use jquery rather than prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
swilliams committed Jul 16, 2010
1 parent 0bcc7b0 commit c21cdda
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,9 +1,6 @@
[submodule "pdoc"]
path = vendor/pdoc
url = git://github.com/tobie/pdoc.git
[submodule "prototype"]
path = vendor/prototype
url = git://github.com/sstephenson/prototype.git
[submodule "sprockets"]
path = vendor/sprockets
url = git://github.com/sstephenson/sprockets.git
Expand Down
38 changes: 20 additions & 18 deletions examples/simple.html
Expand Up @@ -23,26 +23,28 @@
<script src="../src/wysihat/toolbar.js" type="text/javascript" charset="utf-8"></script>

<script type="text/javascript" charset="utf-8">
$(function() {
var editor = WysiHat.Editor.attach('content');
var toolbar = new WysiHat.Toolbar(editor);
$.fn.wysihat = function() {
return this.each(function() {
var editor = WysiHat.Editor.attach($(this));
var toolbar = new WysiHat.Toolbar(editor);
toolbar.initialize(editor);
toolbar.addButtonSet(WysiHat.Toolbar.ButtonSets.Basic);
toolbar.addButtonSet(WysiHat.Toolbar.ButtonSets.Basic);
});
};
//$(function() {
// var editor = WysiHat.Editor.attach('content');
// var toolbar = new WysiHat.Toolbar(editor);
// toolbar.initialize(editor);
// toolbar.addButtonSet(WysiHat.Toolbar.ButtonSets.Basic);
//
// // Hide our error message if the editor loads fine
//
//});

// Hide our error message if the editor loads fine
$('#error').hide();
});

function foo(name) {
this.name = name;
var that = this;
return {
namey: that.name
};
}

var f = new foo('steve');
//alert(f.namey);
$(function() {
$('#content').wysihat();
$('#error').hide();
});

</script>
</head>
Expand Down
1 change: 0 additions & 1 deletion vendor/prototype
Submodule prototype deleted from b8081b

0 comments on commit c21cdda

Please sign in to comment.