lib/chartjs.rb in chartjs-ror-2.1.0 vs lib/chartjs.rb in chartjs-ror-2.1.1

@@ -1,5 +1,14 @@
-require 'chartjs/engine'
-require "chartjs/version"
-
 module Chartjs
+  @@no_conflict = false
+
+  def self.no_conflict!
+    @@no_conflict = true
+  end
+
+  def self.no_conflict
+    @@no_conflict
+  end
 end
+
+require 'chartjs/engine'
+require "chartjs/version"