added functionality that implements already existing content from ser…

…ver, process it and then presents it to the UI

gulpfile.js

@@ -51,4 +51,10 @@ gulp.task("usemin", ['less'], function() {
  .pipe(gulp.dest('dist'));
 });
 
-gulp.task("default", ["usemin"]);
+gulp.task("watch", ["usemin"], function() {
+ gulp.watch("src/js/*.js*", ["usemin"]);
+ gulp.watch("src/css/*.less", ["usemin"])
+});
+
+gulp.task("prod", ["usemin"]);
+gulp.task("default", ["watch"]);

package.json

@@ -1,6 +1,6 @@
 {
  "name": "Legoblocks",
- "version": "0.1.1",
+ "version": "0.1.2",
  "description": "A block based rich text editor with support of Images, embeds( Youtube, twitter, etc)",
  "main": "gulpfile.js",
  "devDependencies": {

src/js/block.embed.jsx

@@ -61,6 +61,7 @@
  checkContent: function(ok) {
  if(ok) {
  this.props.onContentChanged(this.props.position, this.state.url);
+ } else if(this.props.content === this.state.url) {
  } else {
  this.setState({
  loaded: false
@@ -110,17 +111,3 @@
  window.LegoBlocks = APP;
 
 })(window);
-
-/*
-vimeo: {
- regex: /(?:http[s]?:\/\/)?(?:www.)?vimeo\.co(?:.+(?:\/)([^\/].*)+$)/,
- html: "<iframe src=\"<%= protocol %>//player.vimeo.com/video/<%= remote_id %>?title=0&byline=0\" width=\"580\" height=\"320\" frameborder=\"0\"></iframe>"
- },
- youtube: {
- regex: /^.*(?:(?:youtu\.be\/)|(?:youtube\.com)\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*)/,
- html: "<iframe src=\"<%= protocol %>//www.youtube.com/embed/<%= remote_id %>\" width=\"580\" height=\"320\" frameborder=\"0\" allowfullscreen></iframe>"
- }
-*/
-
-//React.render(<LegoBlocks.Instagram url="https://instagram.com/p/6H5rZHkOEF/?taken-by=thedesistuff" />, document.getElementById('editor-content'));
-//React.render(<LegoBlocks.Blocks.Embed.React content="" />, document.getElementById('editor-content'));

src/js/block.embed.youtube.jsx

@@ -57,7 +57,7 @@
  );
  }
  return (
- <div className="legob-embed">Invalid instagram URL.</div>
+ <div className="legob-embed">Invalid youtube URL.</div>
  );
  }
  });

src/js/components.jsx

@@ -12,10 +12,39 @@
  return initialState;
  },
 
+ getDefaultProps: function() {
+ return {
+ blockUrl: ''
+ };
+ },
+
  componentDidMount: function() {
- if(this.props.blocks) {
- this.setState({
- blocks: this.props.blocks
+ var self = this;
+ if(this.props.blockUrl !== '') {
+ fetch(self.props.blockUrl, {
+ credentials: 'same-origin',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ }
+ }).then(function(response) {
+ if (response.status >= 200 && response.status < 300) {
+ return response.json();
+ } else {
+ var error = new Error(response.statusText);
+ error.response = response;
+ throw error;
+ }
+ }).then(function(json) {
+ if(self.props.processData) {
+ self.setState({
+ blocks: self.props.processData(json)
+ });
+ } else {
+ console.warn('Provide a function to process blocks.');
+ }
+ }).catch(function(e) {
+ console.error(e);
  })
  }
  },